[Orxonox-commit 3949] r8623 - code/branches/unity_build/cmake/tools

rgrieder at orxonox.net rgrieder at orxonox.net
Fri May 27 17:12:41 CEST 2011


Author: rgrieder
Date: 2011-05-27 17:12:41 +0200 (Fri, 27 May 2011)
New Revision: 8623

Modified:
   code/branches/unity_build/cmake/tools/BuildUnits.cmake
   code/branches/unity_build/cmake/tools/TargetUtilities.cmake
Log:
Disable precompiled header files for targets with a single build unit.

Modified: code/branches/unity_build/cmake/tools/BuildUnits.cmake
===================================================================
--- code/branches/unity_build/cmake/tools/BuildUnits.cmake	2011-05-27 03:38:43 UTC (rev 8622)
+++ code/branches/unity_build/cmake/tools/BuildUnits.cmake	2011-05-27 15:12:41 UTC (rev 8623)
@@ -61,6 +61,11 @@
     SET(_nr_of_units NR_OF_BUILD_UNITS)
   ENDIF()
 
+  # Disable precompiled header files for single unit targets
+  IF(_nr_of_units EQUAL 1)
+    SET(PCH_DISABLE_${_target_name} TRUE PARENT_SCOPE)
+  ENDIF()
+
   SET(_remaining_files ${_total_file_count})
   SET(_remaining_units ${_nr_of_units})
   SET(_unit_nr 1)

Modified: code/branches/unity_build/cmake/tools/TargetUtilities.cmake
===================================================================
--- code/branches/unity_build/cmake/tools/TargetUtilities.cmake	2011-05-27 03:38:43 UTC (rev 8622)
+++ code/branches/unity_build/cmake/tools/TargetUtilities.cmake	2011-05-27 15:12:41 UTC (rev 8623)
@@ -208,7 +208,7 @@
     # Almost never used individually, but produces a lot of options --> hide
     MARK_AS_ADVANCED(PCH_ENABLE_${_target_name_upper})
 
-    IF(PCH_ENABLE_${_target_name_upper})
+    IF(PCH_ENABLE_${_target_name_upper} AND NOT PCH_DISABLE_${_target_name})
       PRECOMPILED_HEADER_FILES_PRE_TARGET(${_target_name} ${_arg_PCH_FILE} _${_target_name}_files EXCLUDE ${_arg_PCH_EXCLUDE})
     ENDIF()
   ENDIF()
@@ -356,7 +356,7 @@
   ENDIF()
 
   # Second part of precompiled header files
-  IF(PCH_COMPILER_SUPPORT AND PCH_ENABLE_${_target_name_upper} AND _arg_PCH_FILE)
+  IF(PCH_COMPILER_SUPPORT AND PCH_ENABLE_${_target_name_upper} AND _arg_PCH_FILE AND NOT PCH_DISABLE_${_target_name})
     PRECOMPILED_HEADER_FILES_POST_TARGET(${_target_name} ${_arg_PCH_FILE})
   ENDIF()
 




More information about the Orxonox-commit mailing list