Changeset 8569

Timestamp:

May 25, 2011, 2:20:29 AM (14 years ago)

Author:

rgrieder

Message:

Changed binary CMake option DISABLE_BUILD_UNITS to string option ENABLE_BUILD_UNITS with the following possible values:
off/false: Turn off completely
partial: Only combine files explicitly specified with BUILD_UNIT
full##: Use ## source files per orxonox library and use manual build units

for external dependencies. Example: full8 will in general use 8
source files per library, but more specifically tries to occupy
8 CPU threads.

Location:

code/branches/unity_build

Files:

• cmake/tools/TargetUtilities.cmake (modified) (2 diffs)
• src/CMakeLists.txt (modified) (1 diff)
• src/OrxonoxConfig.cmake (modified) (1 diff)

code/branches/unity_build/cmake/tools/TargetUtilities.cmake

@@ -109 +109 @@
         MESSAGE(FATAL_ERROR "No name provided for build unit")
       ENDIF()
-      IF(NOT DISABLE_BUILD_UNITS)
+      IF(ENABLE_BUILD_UNITS)
         IF(NOT _build_unit_include_string)
           MESSAGE(STATUS "Warning: Empty build unit!")
@@ -147 +147 @@
 
       # Handle build units
-      IF(_add_to_build_unit AND NOT DISABLE_BUILD_UNITS)
+      IF(_add_to_build_unit AND ENABLE_BUILD_UNITS)
         IF(_file MATCHES "\\.(c|cc|cpp|cxx)$")
           SET(_build_unit_include_string "${_build_unit_include_string}#include \"${_file}\"\n")

code/branches/unity_build/src/CMakeLists.txt

@@ -66 +66 @@
       ADD_LINKER_FLAGS   ("-INCREMENTAL:NO"  Debug)
     ENDIF()
-    IF(NOT DISABLE_BUILD_UNITS)
+    IF(ENABLE_BUILD_UNITS)
       # Build units seem to generate 'memory leaks' with static variables
       MESSAGE("Warning: You should disable build units when using VLD!")

code/branches/unity_build/src/OrxonoxConfig.cmake

@@ -34 +34 @@
 ENDIF()
 
-# Global switch to disable multiple file compilations
-OPTION(DISABLE_BUILD_UNITS "Disables building multiple source files as one." FALSE)
+# Global option to steer building muliple files as a single one
+# off/false: Turn off completely
+# partial:   Only combine files explicitly specified with BUILD_UNIT
+# full##:    Use ## source files per orxonox library and use manual build units
+#            for external dependencies. Example: full8 will in general use 8
+#            source files per library, but more specifically tries to occupy
+#            8 CPU threads.
+#            This is configured manually in BuildUnitsConfig.cmake
+SET(ENABLE_BUILD_UNITS "partial" CACHE STRING "Enables building multiple source files as one.")
+IF(ENABLE_BUILD_UNITS)
+  INCLUDE(BuildUnitsConfig.cmake)
+ENDIF()
 
 # Use WinMain() or main()?