Ver código fonte

tried to make calls to target_link_libraries more clear/cleanup

CapsAdmin 11 anos atrás
pai
commit
2289cecd37
3 arquivos alterados com 6 adições e 15 exclusões
  1. 1 0
      CMakeLists.txt
  2. 3 11
      QGearsMain/CMakeLists.txt
  3. 2 4
      utilities/CMakeLists.txt

+ 1 - 0
CMakeLists.txt

@@ -93,6 +93,7 @@ if (NOT OGRE_BUILD_PLATFORM_IPHONE)
         find_package(Boost COMPONENTS program_options filesystem QUIET)
         set(OGRE_LIBRARIES ${OGRE_LIBRARIES} ${Boost_LIBRARIES})
         set(QGears_LIBRARIES ${OGRE_LIBRARIES})
+		
         if(QGears_SOUND)
             find_package(OpenAL REQUIRED)
             find_package(OggVorbis REQUIRED)

+ 3 - 11
QGearsMain/CMakeLists.txt

@@ -335,25 +335,17 @@ if( WIN32 AND NOT (CMAKE_BUILD_TYPE MATCHES "Debug") )
     endif()
 endif()
 
-set(LIBRARIES
+target_link_libraries(QGearsMain 
     ${QGears_LIBRARIES}
     LuaBind
 	liblua
     TinyXml
     FinalFantasy7
 )
-if(QGears_SOUND)
-    find_package(OpenAL REQUIRED)
-    find_package(OggVorbis REQUIRED)
-endif()
-
-
-target_link_libraries(QGearsMain ${LIBRARIES} )
 
-set(LIBRARIES
-    QGearsMain
+target_link_libraries(q-gears 
+	QGearsMain
 	${Boost_LIBRARIES}
 )
-target_link_libraries(q-gears ${LIBRARIES})
 
 install(TARGETS q-gears DESTINATION ./games)

+ 2 - 4
utilities/CMakeLists.txt

@@ -39,15 +39,13 @@ add_library(Utility STATIC
   ${SOURCE_FILES}
 )
 
-set(LIBRARIES
+target_link_libraries(Utility
+    QGearsMain
     ${OGRE_LIBRARIES}
     ${OIS_LIBRARIES}
     ${ZLIB_LIBRARIES}
-    QGearsMain
 )
 
-target_link_libraries(Utility ${LIBRARIES})
-
 add_subdirectory(ffix_model_exporter)
 add_subdirectory(ffix_script_dumper)
 add_subdirectory(ffix_sound_dumper)