Changeset 354

Timestamp:

Nov 29, 2007, 6:04:53 PM (17 years ago)

Author:

nicolasc

Message:

removed all STATIC flags — according to besch it's worth it
some minor changes in root-CML

Location:

code/branches/FICN

Files:

• CMakeLists.txt (modified) (3 diffs)
• src/CMakeLists.txt (modified) (1 diff)
• src/orxonox/core/CMakeLists.txt (modified) (1 diff)
• src/orxonox/hud/CMakeLists.txt (modified) (1 diff)
• src/orxonox/objects/CMakeLists.txt (modified) (1 diff)

code/branches/FICN/CMakeLists.txt

@@ -1 +1 @@
 PROJECT(Orxonox)
-
 #set some global variables, which are use throughout the project
 
@@ -9 +8 @@
 SET(Boost_INCLUDE_DIR "/usr/include/boost/")
 
-#force-set the compile on tardis machines, as default points to g++-3.3
+# force-set the compile on tardis machines, as default points to g++-3.3
 # only run this test on a lunix/unix machine
 IF (UNIX)
+
   FIND_PROGRAM(UNAME_CMD "uname"
-        PATHS "/usr/bin /bin")
+  PATHS "/usr/bin /bin")
   IF(NOT UNAME_CMD)
-        MESSAGE("Unable to find uname. Tardis-Check cannot be done.")
+    MESSAGE("Unable to find uname. Tardis-Check cannot be done.")
   ENDIF(NOT UNAME_CMD)
+
+  # run uname -n to get nodename
   EXECUTE_PROCESS(
-        COMMAND "${UNAME_CMD}" "-n"
-        RESULT_VARIABLE UNAME_RV
-        ERROR_VARIABLE UNAME_EV
-        OUTPUT_VARIABLE UNAME_OV)
+  COMMAND "${UNAME_CMD}" "-n"
+  RESULT_VARIABLE UNAME_RV
+  ERROR_VARIABLE UNAME_EV
+  OUTPUT_VARIABLE UNAME_OV)
 
   IF (NOT "${UNAME_RV}" STREQUAL "0")
-        MESSAGE("ERROR: uname terminated unclean.")
+    MESSAGE("ERROR: uname terminated unclean.")
   ENDIF (NOT "${UNAME_RV}" STREQUAL "0")
-# check wheter we are on a tardis INCLUDEmachine
+
+  # check wheter we are on a tardis machine
   IF ("${UNAME_OV}" MATCHES "tardis")
     SET (IS_TARDIS "tardis")
   ENDIF ("${UNAME_OV}" MATCHES "tardis")
+
   # if on tardis change compiler
   IF (IS_TARDIS)
-  MESSAGE("System is a TARDIS: Setting Compiler to g++-4.1.1")
-  SET(CMAKE_CXX_COMPILER "g++-4.1.1")
-# reset eNet serach path
-  SET(Boost_INCLUDE_DIR "/usr/pack/boost-1.34.1-sd/i686-debian-linux3.1/include/boost-1_34_1")
+    MESSAGE("System is a TARDIS: Setting Compiler to g++-4.1.1")
+    SET(CMAKE_CXX_COMPILER "g++-4.1.1")
+    # reset eNet serach path
+    SET(Boost_INCLUDE_DIR "/usr/pack/boost-1.34.1-sd/i686-debian-linux3.1/include/boost-1_34_1")
   ENDIF(IS_TARDIS)
+
 ENDIF (UNIX)
 
@@ -76 +81 @@
 #add main source dir
 ADD_SUBDIRECTORY(src)
-

code/branches/FICN/src/CMakeLists.txt

@@ -6 +6 @@
 ADD_SUBDIRECTORY(network)
 ADD_SUBDIRECTORY(orxonox)
+
+# xml get handled by loader

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

@@ -9 +9 @@
 )
 
-ADD_LIBRARY(core STATIC ${CORE_SRC_FILES})
+ADD_LIBRARY(core ${CORE_SRC_FILES})

code/branches/FICN/src/orxonox/hud/CMakeLists.txt

@@ -8 +8 @@
 LINK_DIRECTORIES(.)
 
-ADD_LIBRARY(hud STATIC ${HUD_SRC_FILES})
+ADD_LIBRARY(hud ${HUD_SRC_FILES})

code/branches/FICN/src/orxonox/objects/CMakeLists.txt

@@ -8 +8 @@
 )
 
-ADD_LIBRARY(objects STATIC ${OBJECTS_SRC_FILES})
+ADD_LIBRARY(objects ${OBJECTS_SRC_FILES})