Changeset 8653 for code/branches/unity_build/cmake/tools

Timestamp:

May 28, 2011, 10:40:10 PM (13 years ago)

Author:

rgrieder

Message:

Since we already have it now: use automatic full build units for external dependencies, even in "partial" mode.
That will not actually change anything except that Bullet is now built in a single unit instead of 3.

Location:

code/branches/unity_build/cmake/tools

Files:

• BuildUnits.cmake (modified) (3 diffs)
• TargetUtilities.cmake (modified) (3 diffs)

code/branches/unity_build/cmake/tools/BuildUnits.cmake

@@ -50 +50 @@
   # However we can specify different values in a config file
   SET(_config ${BUILD_UNITS_CONFIG_${NR_OF_BUILD_UNITS}_THREADS})
+  SET(_nr_of_units)
   IF(_config)
     LIST(FIND _config ${_target_name} _index)
@@ -59 +60 @@
   ENDIF()
   IF(NOT _nr_of_units)
-    # Use default
-    SET(_nr_of_units NR_OF_BUILD_UNITS)
+    # Use default as specified (e.g. "full4" --> 4) or 1 for externals
+    IF(_arg_ORXONOX_EXTERNAL)
+      SET(_nr_of_units 1)
+    ELSE()
+      SET(_nr_of_units ${NR_OF_BUILD_UNITS})
+    ENDIF()
   ENDIF()
 
@@ -113 +118 @@
 
       # Generate the filename
-      SET(_unit_file ${CMAKE_CURRENT_BINARY_DIR}/${_target_name}BuildUnit${_unit_nr}.cc)
+      IF(NOT _nr_of_units EQUAL 1)
+        SET(_suffix ${_unit_nr})
+      ENDIF()
+      SET(_unit_file ${CMAKE_CURRENT_BINARY_DIR}/${_target_name}BuildUnit${_suffix}.cc)
       # Only write if content has changed (avoids recompile)
       IF(EXISTS ${_unit_file})

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

@@ -40 +40 @@
  #      NO_INSTALL:        Do not install the target at all
  #      NO_VERSION:        Prevents adding any version to a target
+ #      NO_BUILD_UNITS:    Disables automatic (full) build units
  #
  #    Lists:
@@ -91 +92 @@
   SET(_switches   FIND_HEADER_FILES  EXCLUDE_FROM_ALL  ORXONOX_EXTERNAL
                   NO_DLL_INTERFACE   NO_SOURCE_GROUPS  PCH_NO_DEFAULT 
-                  NO_INSTALL         NO_VERSION        ${_additional_switches})
+                  NO_INSTALL         NO_VERSION        NO_BUILD_UNITS
+                  ${_additional_switches})
   SET(_list_names LINK_LIBRARIES     VERSION           SOURCE_FILES
                   DEFINE_SYMBOL      TOLUA_FILES       PCH_FILE
@@ -202 +204 @@
 
   # Full build units
-  IF(NOT _arg_ORXONOX_EXTERNAL AND ENABLE_BUILD_UNITS MATCHES "full")
-    GENERATE_BUILD_UNITS(${_target_name} _${_target_name}_files)
+  IF(ENABLE_BUILD_UNITS AND NOT _arg_NO_BUILD_UNITS)
+    # Use full build units even in partial mode for externals
+    IF(ENABLE_BUILD_UNITS MATCHES "full" OR _arg_ORXONOX_EXTERNAL)
+      GENERATE_BUILD_UNITS(${_target_name} _${_target_name}_files)
+    ENDIF()
   ENDIF()