Changeset 2652 for code/branches/buildsystem2/src

Timestamp:

Feb 13, 2009, 10:16:19 AM (16 years ago)

Author:

rgrieder

Message:

• Using REGEX "…" EXCLCUDE in INSTALL avoids a call to FILE(GLOB) (quite slow) at CMake (instead of install) time
• Excluded audio target again (linker tests were successfull so far)
• Removed unexplainable code I once inserted in cpptcl.cc, didn't experience the problem anymore (was weird behaviour anyway)
• Sorting out some library depdencies (just a detail)

Location:

code/branches/buildsystem2/src

Files:

• CMakeLists.txt (modified) (1 diff)
• audio/CMakeLists.txt (modified) (1 diff)
• cpptcl/CMakeLists.txt (modified) (1 diff)
• cpptcl/changes_orxonox.diff (modified) (1 diff)
• cpptcl/cpptcl.cc (modified) (1 diff)
• orxonox/CMakeLists.txt (modified) (2 diffs)

code/branches/buildsystem2/src/CMakeLists.txt

@@ -127 +127 @@
 ADD_SUBDIRECTORY(util)
 ADD_SUBDIRECTORY(core)
-ADD_SUBDIRECTORY(audio)
+#ADD_SUBDIRECTORY(audio)
 ADD_SUBDIRECTORY(network)
 ADD_SUBDIRECTORY(orxonox)

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

@@ -37 +37 @@
 ADD_COMPILER_FLAGS("-w44244" MSVC)
 
-ADD_LIBRARY( audio SHARED ${AUDIO_FILES})
+ADD_LIBRARY(audio SHARED ${AUDIO_FILES})
 SET_TARGET_PROPERTIES(audio PROPERTIES DEFINE_SYMBOL "AUDIO_SHARED_BUILD")
-TARGET_LINK_LIBRARIES( audio
+TARGET_LINK_LIBRARIES(audio
   ${OPENAL_LIBRARY}
   ${ALUT_LIBRARY}

code/branches/buildsystem2/src/cpptcl/CMakeLists.txt

@@ -40 +40 @@
 ENDIF()
 
-TARGET_LINK_LIBRARIES(cpptcl_orxonox
-  ${TCL_LIBRARY}
-)
+TARGET_LINK_LIBRARIES(cpptcl_orxonox ${TCL_LIBRARY})

code/branches/buildsystem2/src/cpptcl/changes_orxonox.diff

@@ -47 +47 @@
  {
       interp_ =  interp;
-@@ -940,6 +952,10 @@
-      // delete all callbacks that were registered for given interpreter
- 
-      {
-+          // TODO: why could this probably be necessary? map::find of empty map
-+          // shouldn't be a problem.
-+          if (callbacks.size() == 0)
-+            return;
-           callback_map::iterator it = callbacks.find(interp);
-           if (it == callbacks.end())
-           {
 --- cpptcl.h    Wed Jan 28 20:56:11 2009
 +++ cpptcl.h    Sat Jan 24 12:52:54 2009

code/branches/buildsystem2/src/cpptcl/cpptcl.cc

@@ -953 +953 @@
 
      {
-          // TODO: why could this probably be necessary? map::find of empty map
-          // shouldn't be a problem.
-          if (callbacks.size() == 0)
-            return;
           callback_map::iterator it = callbacks.find(interp);
           if (it == callbacks.end())

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

@@ -59 +59 @@
 ENDIF(NETWORKTRAFFIC_TESTING_ENABLED)
 
-TARGET_LINK_LIBRARIES( orxonox
+TARGET_LINK_LIBRARIES(orxonox
   ${OGRE_LIBRARY}
   ${CEGUI_LIBRARY}
   ${LUA_LIBRARIES}
   ${CEGUILUA_LIBRARY}
+  ${Boost_SYSTEM_LIBRARY}
   ogreceguirenderer_orxonox
   tinyxml++_orxonox
@@ -69 +70 @@
   util
   core
+  network
   #audio
-  network
 )