Changeset 1070 for code/trunk

Timestamp:

Apr 15, 2008, 1:03:09 PM (17 years ago)

Author:

rgrieder

Message:

• moved "—no-undefined" linker flag to root CMLs
• removed library directories for our own libs from root CMLs (might not work)
• removed warning in Hud.cc (float instead of integer)

Location:

code/trunk

Files:

• CMakeLists.txt (modified) (3 diffs)
• src/audio/CMakeLists.txt (modified) (1 diff)
• src/core/CMakeLists.txt (modified) (1 diff)
• src/network/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/CMakeLists.txt (modified) (1 diff)
• src/orxonox/hud/HUD.cc (modified) (1 diff)
• src/util/CMakeLists.txt (modified) (1 diff)

code/trunk/CMakeLists.txt

@@ -2 +2 @@
 #set some global variables, which are used throughout the project
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
-SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin/lib)
+SET(LIBRARY_OUTPUT_PATH    ${PROJECT_BINARY_DIR}/bin/lib)
 
 OPTION(TESTING_ENABLED "Do you want to enable Testing")
@@ -57 +57 @@
 SET(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} -O2 -Wall -g -ggdb")
 SET(CMAKE_LD_FLAGS "$ENV{LDFLAGS}")
+SET(CMAKE_EXE_LINKER_FLAGS " --no-undefined")
+SET(CMAKE_SHARED_LINKER_FLAGS " --no-undefined")
+#SET(CMAKE_MODULE_LINKER_FLAGS " --no-undefined")
 
 #This sets where to look for "Find*.cmake" files
@@ -72 +75 @@
 FIND_PACKAGE(ZLIB)
 FIND_PACKAGE(Lua)
-#FIND_PACKAGE(ToLua)
 
 #Sets the search paths for the linking
-LINK_DIRECTORIES(${OGRE_LIB_DIR} ${OIS_LIB_DIR} ${CEGUI_LIB_DIR} ${CEGUI_OGRE_LIB_DIR} ${ENet_LIBRARY} ${Boost_LIBRARY_DIRS} ${Zlib_LIBRARY_DIR} ${Lua_LIBRARIES} core objects loader network weapon classHierarchy audio)
+LINK_DIRECTORIES(
+  ${OGRE_LIB_DIR}
+  ${OIS_LIB_DIR}
+  ${CEGUI_LIB_DIR} ${CEGUI_OGRE_LIB_DIR}
+  ${ENet_LIBRARY}
+  ${Boost_LIBRARY_DIRS}
+  ${Zlib_LIBRARY_DIR}
+  ${Lua_LIBRARIES}
+#  core objects loader network weapon classHierarchy audio
+)
+
 #Sets the search path for include files
-INCLUDE_DIRECTORIES(${OGRE_INCLUDE_DIR} ${OIS_INCLUDE_DIR} ${CEGUI_INCLUDE_DIR} ${CEGUI_OGRE_INCLUDE_DIR} ${ENet_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ${OPENAL_INCLUDE_DIR} ${ALUT_INCLUDE_DIR} ${VORBIS_INCLUDE_DIR} ${OGG_INCLUDE_DIR} ${Lua_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(
+  ${OGRE_INCLUDE_DIR}
+  ${OIS_INCLUDE_DIR}
+  ${CEGUI_INCLUDE_DIR} ${CEGUI_OGRE_INCLUDE_DIR}
+  ${ENet_INCLUDE_DIR}
+  ${Boost_INCLUDE_DIRS}
+  ${OPENAL_INCLUDE_DIR} ${ALUT_INCLUDE_DIR} ${VORBIS_INCLUDE_DIR} ${OGG_INCLUDE_DIR}
+  ${Lua_INCLUDE_DIR}
+)
 
 #Set the execution directory

code/trunk/src/audio/CMakeLists.txt

@@ -9 +9 @@
   ADD_LIBRARY( audio ${AUDIO_SRC_FILES} )
 ELSE (WIN32)
-  ADD_LIBRARY( audio SHARED ${AUDIO_SRC_FILES})
+  ADD_LIBRARY( audio SHARED ${AUDIO_SRC_FILES} )
 ENDIF (WIN32)
-
-SET_TARGET_PROPERTIES( audio PROPERTIES LINK_FLAGS "--no-undefined" )
 
 TARGET_LINK_LIBRARIES( audio

code/trunk/src/core/CMakeLists.txt

@@ -30 +30 @@
 
 ADD_LIBRARY( core SHARED ${CORE_SRC_FILES})
-SET_TARGET_PROPERTIES( core PROPERTIES LINK_FLAGS "--no-undefined" )
 
 TARGET_LINK_LIBRARIES( core

code/trunk/src/network/CMakeLists.txt

@@ -15 +15 @@
 
 IF(WIN32)
-  ADD_LIBRARY( network ${NETWORK_SRC_FILES})
+  ADD_LIBRARY( network ${NETWORK_SRC_FILES} )
 ELSE(WIN32)
-  ADD_LIBRARY( network SHARED ${NETWORK_SRC_FILES})
+  ADD_LIBRARY( network SHARED ${NETWORK_SRC_FILES} )
 ENDIF(WIN32)
-
-SET_TARGET_PROPERTIES( network PROPERTIES LINK_FLAGS "--no-undefined" )
 
 TARGET_LINK_LIBRARIES( network
@@ -28 +26 @@
   core
 )
+
 
 # build those parts only on request.

code/trunk/src/orxonox/CMakeLists.txt

@@ -34 +34 @@
 ADD_EXECUTABLE( orxonox ${ORXONOX_SRC_FILES} )
 
-SET_TARGET_PROPERTIES( orxonox PROPERTIES LINK_FLAGS "--no-undefined" )
-
 TARGET_LINK_LIBRARIES( orxonox
   ${OGRE_LIBRARIES}

code/trunk/src/orxonox/hud/HUD.cc

@@ -50 +50 @@
     setTargetWindowDistance(30);
 
-    setEnergyValue(60.0);
+    setEnergyValue(60);
 
     setShieldLeftTopValue(true);

code/trunk/src/util/CMakeLists.txt

@@ -18 +18 @@
 
 ADD_LIBRARY( util SHARED ${UTIL_SRC_FILES} )
-SET_TARGET_PROPERTIES( util PROPERTIES LINK_FLAGS "--no-undefined" )
 
 IF(TESTING_ENABLED)