[Orxonox-commit 3976] r8650 - in code/branches/unity_build: cmake/tools src/libraries/core

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2011-05-28 21:57:45 +0200 (Sat, 28 May 2011)
New Revision: 8650

Modified:
   code/branches/unity_build/cmake/tools/GenerateToluaBindings.cmake
   code/branches/unity_build/cmake/tools/TargetUtilities.cmake
   code/branches/unity_build/src/libraries/core/CMakeLists.txt
Log:
Also add tolua bind files to build units (for the sake of completeness ^^).

Modified: code/branches/unity_build/cmake/tools/GenerateToluaBindings.cmake
===================================================================
--- code/branches/unity_build/cmake/tools/GenerateToluaBindings.cmake	2011-05-28 19:56:50 UTC (rev 8649)
+++ code/branches/unity_build/cmake/tools/GenerateToluaBindings.cmake	2011-05-28 19:57:45 UTC (rev 8650)
@@ -57,11 +57,17 @@
     PARENT_SCOPE
   )
 
-  # Disable annoying GCC warnings
   IF(CMAKE_COMPILER_IS_GNU)
+    # Disable annoying GCC warnings
     SET_SOURCE_FILES_PROPERTIES(${_tolua_cxxfile} PROPERTIES COMPILE_FLAGS "-w")
   ENDIF()
 
+  IF(MSVC)
+    # Including the file in a build unit is impossible because CMAKE_CFG_INTDIR
+    # exands to an expression that the compiler doesn't understand
+    SET_SOURCE_FILES_PROPERTIES(${_tolua_cxxfile} PROPERTIES EXCLUDE_FROM_BUILD_UNITS TRUE)
+  ENDIF()
+
   # Create temporary package file and implicit dependencies
   FILE(REMOVE ${_tolua_pkgfile})
   FOREACH(_tolua_inputfile ${_tolua_inputfiles})

Modified: code/branches/unity_build/cmake/tools/TargetUtilities.cmake
===================================================================
--- code/branches/unity_build/cmake/tools/TargetUtilities.cmake	2011-05-28 19:56:50 UTC (rev 8649)
+++ code/branches/unity_build/cmake/tools/TargetUtilities.cmake	2011-05-28 19:57:45 UTC (rev 8650)
@@ -181,17 +181,6 @@
   # 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
-  IF(NOT _arg_ORXONOX_EXTERNAL AND ENABLE_BUILD_UNITS MATCHES "full")
-    GENERATE_BUILD_UNITS(${_target_name} _${_target_name}_files)
-  ENDIF()
-
   # TOLUA_FILES
   IF(_arg_TOLUA_FILES)
     GENERATE_TOLUA_BINDINGS(${_target_name_capitalised} _${_target_name}_files
@@ -205,6 +194,17 @@
     ENDIF()
   ENDIF()
 
+  # 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
+  IF(NOT _arg_ORXONOX_EXTERNAL AND ENABLE_BUILD_UNITS MATCHES "full")
+    GENERATE_BUILD_UNITS(${_target_name} _${_target_name}_files)
+  ENDIF()
+
   # First part (pre target) of precompiled header files
   IF(PCH_COMPILER_SUPPORT AND _arg_PCH_FILE)
     # Provide convenient option to control PCH

Modified: code/branches/unity_build/src/libraries/core/CMakeLists.txt
===================================================================
--- code/branches/unity_build/src/libraries/core/CMakeLists.txt	2011-05-28 19:56:50 UTC (rev 8649)
+++ code/branches/unity_build/src/libraries/core/CMakeLists.txt	2011-05-28 19:57:45 UTC (rev 8650)
@@ -18,40 +18,40 @@
  #
 
 SET_SOURCE_FILES(CORE_SRC_FILES
+
+#BUILD_UNIT CoreStableBuildUnit.cc
+  ClassTreeMask.cc
   CommandLineParser.cc
   ConfigValueContainer.cc
-  Core.cc
   DynLib.cc
   DynLibManager.cc
   Event.cc
   Game.cc
   GameMode.cc
   GameState.cc
-  GraphicsManager.cc
-  GUIManager.cc
+  Identifier.cc
   Language.cc
+  Loader.cc
   LuaState.cc
-  ObjectListBase.cc
-  OrxonoxClass.cc
-  Resource.cc
-
-  # hierarchy
-  Identifier.cc
   MetaObjectList.cc
-
-  # level
-  BaseObject.cc
-  ClassTreeMask.cc
-  Loader.cc
   Namespace.cc
   NamespaceNode.cc
+  ObjectListBase.cc
+  OrxonoxClass.cc
   Template.cc
-  XMLPort.cc
-
-BUILD_UNIT ListenerBuildUnit.cc
   ViewportEventListener.cc
   WindowEventListener.cc
   XMLNameListener.cc
+  XMLPort.cc
+#END_BUILD_UNIT
+
+  BaseObject.cc
+  Core.cc
+
+BUILD_UNIT OgreBuildUnit.cc
+  GraphicsManager.cc
+  GUIManager.cc
+  Resource.cc
 END_BUILD_UNIT
 
 BUILD_UNIT FilesystemBuildUnit.cc
@@ -60,11 +60,10 @@
   PathConfig.cc
 END_BUILD_UNIT
 
-  # multithreading
-  ThreadPool.cc
 BUILD_UNIT ThreadBuildUnit.cc
   command/TclThreadManager.cc
   Thread.cc
+  ThreadPool.cc
 END_BUILD_UNIT
 )