Changeset 758 for code

Timestamp:

Dec 31, 2007, 2:21:25 PM (17 years ago)

Author:

rgrieder

Message:

• fix trial

Location:

code/branches/FICN_test/src

Files:

• audio/CMakeLists.txt (modified) (2 diffs)
• loader/CMakeLists.txt (modified) (1 diff)
• network/CMakeLists.txt (modified) (1 diff)
• orxonox/CMakeLists.txt (modified) (1 diff)
• util/CMakeLists.txt (modified) (1 diff)

code/branches/FICN_test/src/audio/CMakeLists.txt

@@ -8 +8 @@
 
 ADD_LIBRARY(${Orxonox_BINARY_DIR}/audio SHARED ${SRC_FILES})
-SET_TARGET_PROPERTIES( audio PROPERTIES LINK_FLAGS "--no-undefined" )
+SET_TARGET_PROPERTIES( ${Orxonox_BINARY_DIR}/audio PROPERTIES LINK_FLAGS "--no-undefined" )
 
-TARGET_LINK_LIBRARIES( audio
+TARGET_LINK_LIBRARIES( ${Orxonox_BINARY_DIR}/audio
   ${OPENAL_LIBRARY}
   ${ALUT_LIBRARY}
@@ -17 +17 @@
 #  ${VORBIS_LIBRARY}
 #  ${OGG_LIBRARY}
+  ${Orxonox_BINARY_DIR}/core
 )
 

code/branches/FICN_test/src/loader/CMakeLists.txt

@@ -4 +4 @@
 
 ADD_LIBRARY(${Orxonox_BINARY_DIR}/loader SHARED ${LOADER_SRC_FILES})
-SET_TARGET_PROPERTIES( loader PROPERTIES LINK_FLAGS "--no-undefined" )
+SET_TARGET_PROPERTIES( ${Orxonox_BINARY_DIR}/loader PROPERTIES LINK_FLAGS "--no-undefined" )
 
-TARGET_LINK_LIBRARIES( loader
-  util
+TARGET_LINK_LIBRARIES( ${Orxonox_BINARY_DIR}/loader
+  ${Orxonox_BINARY_DIR}/util
 )

code/branches/FICN_test/src/network/CMakeLists.txt

@@ -19 +19 @@
   ADD_LIBRARY(${Orxonox_BINARY_DIR}/network SHARED ${NETWORK_SRC_FILES})
 ENDIF(WIN32)
-SET_TARGET_PROPERTIES( network PROPERTIES LINK_FLAGS "--no-undefined" )
+SET_TARGET_PROPERTIES( ${Orxonox_BINARY_DIR}/network PROPERTIES LINK_FLAGS "--no-undefined" )
 
-TARGET_LINK_LIBRARIES( network
+TARGET_LINK_LIBRARIES( ${Orxonox_BINARY_DIR}/network
   ${ZLIB_LIBRARY}
   ${ENet_LIBRARY}
   ${Boost_thread_LIBRARIES}
-  core
+  ${Orxonox_BINARY_DIR}/core
 )
 

code/branches/FICN_test/src/orxonox/CMakeLists.txt

@@ -35 +35 @@
 ADD_EXECUTABLE(${Orxonox_BINARY_DIR}/main ${ORXONOX_SRC_FILES} )
 
-SET_TARGET_PROPERTIES( main PROPERTIES LINK_FLAGS "--no-undefined" )
+SET_TARGET_PROPERTIES( ${Orxonox_BINARY_DIR}/main PROPERTIES LINK_FLAGS "--no-undefined" )
 
-TARGET_LINK_LIBRARIES( main
+TARGET_LINK_LIBRARIES( ${Orxonox_BINARY_DIR}/main
   ${OGRE_LIBRARIES}
   ${OIS_LIBRARIES}
-  util
-  core
-  audio
-  network
-  loader
+  ${Orxonox_BINARY_DIR}/util
+  ${Orxonox_BINARY_DIR}/core
+  ${Orxonox_BINARY_DIR}/audio
+  ${Orxonox_BINARY_DIR}/network
+  ${Orxonox_BINARY_DIR}/loader
 )
 

code/branches/FICN_test/src/util/CMakeLists.txt

@@ -9 +9 @@
 
 IF(WIN32)
-  ADD_LIBRARY(util ${UTIL_SRC_FILES} )
+  ADD_LIBRARY(${Orxonox_BINARY_DIR}/util ${UTIL_SRC_FILES} )
 ELSE(WIN32)
-  ADD_LIBRARY(util SHARED ${UTIL_SRC_FILES} )
+  ADD_LIBRARY(${Orxonox_BINARY_DIR}/util SHARED ${UTIL_SRC_FILES} )
 ENDIF(WIN32)
-SET_TARGET_PROPERTIES( util PROPERTIES LINK_FLAGS "--no-undefined" )
+SET_TARGET_PROPERTIES( ${Orxonox_BINARY_DIR}/util PROPERTIES LINK_FLAGS "--no-undefined" )