Changeset 8649

Timestamp:

May 28, 2011, 9:56:50 PM (13 years ago)

Author:

rgrieder

Message:

Added EXCLUDE_FROM_BUILD_UNITS to the ADD_TARGET commands and implemented it's effects.

Location:

code/branches/unity_build/cmake/tools

Files:

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

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

@@ -31 +31 @@
     IF(_file MATCHES "\\.(cpp|cc|cxx)$")
       # Some files might be marked as not to compile at all
-      GET_SOURCE_FILE_PROPERTY(_skip ${_file} HEADER_FILE_ONLY)
-      IF(NOT _skip)
+      GET_SOURCE_FILE_PROPERTY(_skip1 ${_file} HEADER_FILE_ONLY)
+      GET_SOURCE_FILE_PROPERTY(_skip2 ${_file} EXCLUDE_FROM_BUILD_UNITS)
+      IF(NOT _skip1 AND NOT _skip2)
         GET_SOURCE_FILE_PROPERTY(_size ${_file} BUILD_UNIT_SIZE)
         IF(NOT _size)

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

@@ -54 +54 @@
  #      PCH_EXCLUDE:       Source files to be excluded from PCH support
  #      OUTPUT_NAME:       If you want a different name than the target name
+ #      EXCLUDE_FROM_BUILD_UNITS: Specifies files that are not put into
+ #                         automatic (full) build units. They can still
+ #                         explicitely be included in a BUILD_UNIT (partial)
  #  Note:
  #    This function also installs the target!
@@ -92 +95 @@
                   DEFINE_SYMBOL      TOLUA_FILES       PCH_FILE
                   PCH_EXCLUDE        OUTPUT_NAME       LINK_LIBS_LINUX
-                  LINK_LIBS_WIN32    LINK_LIBS_APPLE   LINK_LIBS_UNIX)
+                  LINK_LIBS_WIN32    LINK_LIBS_APPLE   LINK_LIBS_UNIX
+                  EXCLUDE_FROM_BUILD_UNITS)
 
   PARSE_MACRO_ARGUMENTS("${_switches}" "${_list_names}" ${ARGN})
@@ -177 +181 @@
   # Remove potential duplicates
   LIST(REMOVE_DUPLICATES _${_target_name}_files)
+
+  # Mark files to be excluded from build units
+  IF(_arg_EXCLUDE_FROM_BUILD_UNITS)
+    SET_SOURCE_FILES_PROPERTIES(${_arg_EXCLUDE_FROM_BUILD_UNITS}
+      PROPERTIES EXCLUDE_FROM_BUILD_UNITS TRUE)
+  ENDIF()
 
   # Full build units