[Orxonox-commit 3952] r8626 - in code/branches/unity_build: cmake/tools src

rgrieder at orxonox.net rgrieder at orxonox.net
Fri May 27 19:39:37 CEST 2011


Author: rgrieder
Date: 2011-05-27 19:39:36 +0200 (Fri, 27 May 2011)
New Revision: 8626

Modified:
   code/branches/unity_build/cmake/tools/BuildUnits.cmake
   code/branches/unity_build/src/BuildUnitsConfig.cmake
Log:
Optimised unit builds a little

Modified: code/branches/unity_build/cmake/tools/BuildUnits.cmake
===================================================================
--- code/branches/unity_build/cmake/tools/BuildUnits.cmake	2011-05-27 16:28:58 UTC (rev 8625)
+++ code/branches/unity_build/cmake/tools/BuildUnits.cmake	2011-05-27 17:39:36 UTC (rev 8626)
@@ -61,8 +61,8 @@
     SET(_nr_of_units NR_OF_BUILD_UNITS)
   ENDIF()
 
-  # Disable precompiled header files for single unit targets
-  IF(_nr_of_units EQUAL 1)
+  # Disable precompiled header files for targets with two or less build units
+  IF(_nr_of_units LESS 3)
     SET(PCH_DISABLE_${_target_name} TRUE PARENT_SCOPE)
   ENDIF()
 

Modified: code/branches/unity_build/src/BuildUnitsConfig.cmake
===================================================================
--- code/branches/unity_build/src/BuildUnitsConfig.cmake	2011-05-27 16:28:58 UTC (rev 8625)
+++ code/branches/unity_build/src/BuildUnitsConfig.cmake	2011-05-27 17:39:36 UTC (rev 8626)
@@ -42,17 +42,17 @@
 SET(BUILD_UNITS_CONFIG_4_THREADS
   util              1
   core              4
-  network           3
-  tools             1
+  network           2
+  tools             2
   orxonox           4
   designtools       1
   notifications     1
   objects           2
   overlays          2
   pickup            1
-  pong              15
-  questsystem       2
-  weapons           2
+  pong              1
+  questsystem       1
+  weapons           1
 )
 
 SET(BUILD_UNITS_CONFIG_8_THREADS




More information about the Orxonox-commit mailing list