Changeset 761

Timestamp:

Dec 31, 2007, 2:49:18 PM (17 years ago)

Author:

rgrieder

Message:

• blubb #2

Location:

code/branches/FICN_test/src

Files:

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

code/branches/FICN_test/src/CMakeLists.txt

@@ -1 +1 @@
 INCLUDE_DIRECTORIES(.)
-LINK_DIRECTORIES(${Orxonox_BINARY_DIR})
 
 ADD_SUBDIRECTORY(util)

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

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

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

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

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

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

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

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

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

@@ -15 +15 @@
 )
 
-ADD_LIBRARY(${Orxonox_BINARY_DIR}/core SHARED ${CORE_SRC_FILES})
-SET_TARGET_PROPERTIES( ${Orxonox_BINARY_DIR}/core PROPERTIES LINK_FLAGS "--no-undefined" )
+ADD_LIBRARY( core SHARED ${CORE_SRC_FILES})
+SET_TARGET_PROPERTIES( core PROPERTIES LINK_FLAGS "--no-undefined" )
 
-TARGET_LINK_LIBRARIES( ${Orxonox_BINARY_DIR}/core
-  ${Orxonox_BINARY_DIR}/util
+TARGET_LINK_LIBRARIES( core
+  util
 )