Changeset 358

Timestamp:

Nov 29, 2007, 9:24:58 PM (16 years ago)

Author:

rgrieder

Message:

• fixed bug with SET_TARGET_PROPERTIES (works now according to linker command line, but it is still possible to add a function
• added a lot of SHARED, since STATIC is actually the default value (confirmed by console message: linking static library blah..)

Location:

code/branches/FICN/src

Files:

• 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)
• orxonox/hud/CMakeLists.txt (modified) (1 diff)
• orxonox/objects/CMakeLists.txt (modified) (1 diff)
• orxonox/weapon/CMakeLists.txt (modified) (1 diff)

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

@@ -7 +7 @@
 )
 
-ADD_LIBRARY(loader ${LOADER_SRC_FILES})
+ADD_LIBRARY(loader SHARED ${LOADER_SRC_FILES})

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

@@ -13 +13 @@
 )
 
-ADD_LIBRARY(network ${NETWORK_SRC_FILES})
+ADD_LIBRARY(network SHARED ${NETWORK_SRC_FILES})

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

@@ -8 +8 @@
 ADD_EXECUTABLE(../../bin/main ${ORXONOX_SRC_FILES})
 
-SET_TARGET_PROPERTIES(../../bin/main LINK_FLAGS "--no-undefined" )
+SET_TARGET_PROPERTIES(../../bin/main PROPERTIES LINK_FLAGS "--no-undefined" )
 
 

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

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

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

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

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

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

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

@@ -10 +10 @@
 )
 
-ADD_LIBRARY(weapon STATIC ${WEAPON_SRC_FILES})
+ADD_LIBRARY(weapon SHARED ${WEAPON_SRC_FILES})