Changeset 8633

Timestamp:

May 28, 2011, 2:49:58 AM (14 years ago)

Author:

rgrieder

Message:

Optimised build units for MSVC too by splitting the config file in two.
Note that I had to guess the values for 8 threads, I can not (yet) test that.
Also note that the MSVC config applies to having MSVC configured to make N targets at once (leading up to possibly N*N processes). Seems stupid, is stupid, but is still the fastest when compiling Orxonox.

Location:

code/branches/unity_build/src

Files:

• BuildUnitsConfigGCC.cmake (copied) (copied from code/branches/unity_build/src/BuildUnitsConfig.cmake)
• BuildUnitsConfigMSVC.cmake (moved) (moved from code/branches/unity_build/src/BuildUnitsConfig.cmake) (3 diffs)
• OrxonoxConfig.cmake (modified) (1 diff)

code/branches/unity_build/src/BuildUnitsConfigMSVC.cmake

@@ -29 +29 @@
   network           1
   tools             1
-  orxonox           8
+  orxonox           2
   designtools       1
   notifications     1
   objects           2
-  overlays          2
-  pickup            2
+  overlays          1
+  pickup            1
   pong              1
   questsystem       1
@@ -41 +41 @@
 
 SET(BUILD_UNITS_CONFIG_4_THREADS
-  util              1
+  util              2
   core              4
   network           2
   tools             2
-  orxonox           8
+  orxonox           4
   designtools       1
   notifications     1
@@ -52 +52 @@
   pickup            1
   pong              1
-  questsystem       1
-  weapons           1
+  questsystem       2
+  weapons           2
 )
 

code/branches/unity_build/src/OrxonoxConfig.cmake

@@ -52 +52 @@
     ENDIF()
   ENDIF()
-  INCLUDE(BuildUnitsConfig.cmake)
+  IF(CMAKE_COMPILER_IS_GNU)
+    INCLUDE(BuildUnitsConfigGCC.cmake)
+  ELSEIF(MSVC)
+    INCLUDE(BuildUnitsConfigMSVC.cmake)
+  ENDIF()
 ENDIF()