Changeset 8622

Timestamp:

May 27, 2011, 5:38:43 AM (13 years ago)

Author:

rgrieder

Message:

Added implementation of full build units.
Please refer to r8569 or OrxonoxConfig.cmake for an explanation of the new option.

Location:

code/branches/unity_build

Files:

• cmake/tools/BuildUnits.cmake (added)
• cmake/tools/TargetUtilities.cmake (modified) (4 diffs)
• src/BuildUnitsConfig.cmake (added)
• src/OrxonoxConfig.cmake (modified) (1 diff)

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

@@ -62 +62 @@
  #
 
+INCLUDE(BuildUnits)
 INCLUDE(CMakeDependentOption)
 INCLUDE(CapitaliseName)
@@ -120 +121 @@
         ENDIF()
         LIST(APPEND _${_target_name}_source_files ${_build_unit_file})
+        LIST(APPEND _${_target_name}_build_units ${_build_unit_file})
+        # Store the number of files included. May be used for full build units.
+        SET_SOURCE_FILES_PROPERTIES(${_build_unit_file}
+          PROPERTIES BUILD_UNIT_SIZE "${_build_unit_count}")
       ENDIF()
       SET(_add_to_build_unit FALSE)
     ELSEIF(_get_build_unit_file)
+      # Note: ${_file} is relative to the binary directory
       SET(_build_unit_file ${CMAKE_BINARY_DIR}/${_file})
       SET(_get_build_unit_file FALSE)
       SET(_add_to_build_unit TRUE)
       SET(_build_unit_include_string)
+      SET(_build_unit_count "0")
     ELSE()
       # Default, add source file
@@ -150 +157 @@
         IF(_file MATCHES "\\.(c|cc|cpp|cxx)$")
           SET(_build_unit_include_string "${_build_unit_include_string}#include \"${_file}\"\n")
+          MATH(EXPR _build_unit_count "1 + ${_build_unit_count}")
         ENDIF()
         # Don't compile these files, even if they are source files
@@ -169 +177 @@
   # Remove potential duplicates
   LIST(REMOVE_DUPLICATES _${_target_name}_files)
+
+  # Full build units
+  IF(NOT _arg_ORXONOX_EXTERNAL AND ENABLE_BUILD_UNITS MATCHES "full")
+    GENERATE_BUILD_UNITS(${_target_name} _${_target_name}_files)
+  ENDIF()
 
   # TOLUA_FILES

code/branches/unity_build/src/OrxonoxConfig.cmake

@@ -44 +44 @@
 SET(ENABLE_BUILD_UNITS "partial" CACHE STRING "Enables building multiple source files as one.")
 IF(ENABLE_BUILD_UNITS)
+  IF(NOT "${ENABLE_BUILD_UNITS}" STREQUAL "partial")
+    STRING(REGEX REPLACE "^full([1-9][0-9]?)$" "\\1" _nr_of_units "${ENABLE_BUILD_UNITS}")
+    IF("${_nr_of_units}" STREQUAL "${ENABLE_BUILD_UNITS}") # Regex match failed
+      MESSAGE(FATAL_ERROR "Unrecognised option for ENABLE_BUILD_UNITS: ${ENABLE_BUILD_UNITS}")
+    ELSE()
+      SET(NR_OF_BUILD_UNITS ${_nr_of_units})
+    ENDIF()
+  ENDIF()
   INCLUDE(BuildUnitsConfig.cmake)
 ENDIF()