[Orxonox-commit 2640] r7345 - in code/branches/doc: cmake/tools src

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2010-09-04 00:50:25 +0200 (Sat, 04 Sep 2010)
New Revision: 7345

Modified:
   code/branches/doc/cmake/tools/TargetUtilities.cmake
   code/branches/doc/src/CMakeLists.txt
Log:
Orxonox executable should depend on all modules (may otherwise be problematic in IDEs).

Modified: code/branches/doc/cmake/tools/TargetUtilities.cmake
===================================================================
--- code/branches/doc/cmake/tools/TargetUtilities.cmake	2010-09-03 21:54:30 UTC (rev 7344)
+++ code/branches/doc/cmake/tools/TargetUtilities.cmake	2010-09-03 22:50:25 UTC (rev 7345)
@@ -208,6 +208,8 @@
       LIBRARY_OUTPUT_DIRECTORY ${CMAKE_MODULE_OUTPUT_DIRECTORY} # Unix
     )
     ADD_MODULE(${_target_name})
+    # Ensure that the main program depends on the module
+    SET(ORXONOX_MODULES ${ORXONOX_MODULES} ${_target_name} CACHE STRING "" FORCE)
   ENDIF()
 
   # LINK_LIBRARIES

Modified: code/branches/doc/src/CMakeLists.txt
===================================================================
--- code/branches/doc/src/CMakeLists.txt	2010-09-03 21:54:30 UTC (rev 7344)
+++ code/branches/doc/src/CMakeLists.txt	2010-09-03 22:50:25 UTC (rev 7345)
@@ -136,6 +136,8 @@
     Orxonox.cc
   OUTPUT_NAME orxonox
 )
+# Main executable should depend on all modules
+ADD_DEPENDENCIES(orxonox-main ${ORXONOX_MODULES})
 
 # Get name to configure the run scripts
 GET_TARGET_PROPERTY(_exec_loc orxonox-main LOCATION)