Changeset 760 for code/branches

Timestamp:

Dec 31, 2007, 2:45:35 PM (17 years ago)

Author:

rgrieder

Message:

• blubb #1

Location:

code/branches/FICN_test

Files:

• CMakeLists.txt (modified) (1 diff)
• src/util/CMakeLists.txt (modified) (1 diff)

code/branches/FICN_test/CMakeLists.txt

@@ -1 +1 @@
 PROJECT(Orxonox)
 #set some global variables, which are used throughout the project
-SET( Orxonox_BINARY_DIR ${Orxonox_SOURCE_DIR}/bin)
-SET( Orxonox_SOURCE_DIR ${Orxonox_SOURCE_DIR}/src)
+#SET( Orxonox_BINARY_DIR ${Orxonox_SOURCE_DIR}/bin)
+#SET( Orxonox_SOURCE_DIR ${Orxonox_SOURCE_DIR}/src)
+SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
+SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin/lib)
 
 OPTION(TESTING_ENABLED "Do you want to enable Testing")

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

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