[Orxonox-commit 3314] r8003 - in code/branches/usability: cmake/tools src
rgrieder at orxonox.net
rgrieder at orxonox.net
Tue Mar 1 04:32:42 CET 2011
Author: rgrieder
Date: 2011-03-01 04:32:41 +0100 (Tue, 01 Mar 2011)
New Revision: 8003
Modified:
code/branches/usability/cmake/tools/TargetUtilities.cmake
code/branches/usability/src/CMakeLists.txt
Log:
Fixed ORXONOX_MODULES variable (you don't see it anymore in the CMake GUI now).
Modified: code/branches/usability/cmake/tools/TargetUtilities.cmake
===================================================================
--- code/branches/usability/cmake/tools/TargetUtilities.cmake 2011-02-28 05:17:40 UTC (rev 8002)
+++ code/branches/usability/cmake/tools/TargetUtilities.cmake 2011-03-01 03:32:41 UTC (rev 8003)
@@ -265,7 +265,7 @@
)
ADD_MODULE(${_target_name})
# Ensure that the main program depends on the module
- SET(ORXONOX_MODULES ${ORXONOX_MODULES} ${_target_name} CACHE STRING "" FORCE)
+ SET(ORXONOX_MODULES ${ORXONOX_MODULES} ${_target_name} CACHE INTERNAL "")
ENDIF()
# Static library flags are not globally available
Modified: code/branches/usability/src/CMakeLists.txt
===================================================================
--- code/branches/usability/src/CMakeLists.txt 2011-02-28 05:17:40 UTC (rev 8002)
+++ code/branches/usability/src/CMakeLists.txt 2011-03-01 03:32:41 UTC (rev 8003)
@@ -118,6 +118,7 @@
ADD_SUBDIRECTORY(external)
ADD_SUBDIRECTORY(libraries)
ADD_SUBDIRECTORY(orxonox)
+SET(ORXONOX_MODULES CACHE INTERNAL "")
ADD_SUBDIRECTORY(modules)
################## Executable ###################
More information about the Orxonox-commit
mailing list