Changeset 8650 for code/branches

Timestamp:

May 28, 2011, 9:57:45 PM (13 years ago)

Author:

rgrieder

Message:

Also add tolua bind files to build units (for the sake of completeness ).

Location:

code/branches/unity_build

Files:

• cmake/tools/GenerateToluaBindings.cmake (modified) (1 diff)
• cmake/tools/TargetUtilities.cmake (modified) (2 diffs)
• src/libraries/core/CMakeLists.txt (modified) (3 diffs)

code/branches/unity_build/cmake/tools/GenerateToluaBindings.cmake

@@ -58 +58 @@
   )
 
-  # 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()
 

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

@@ -182 +182 @@
   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)
@@ -204 +193 @@
       ENDFOREACH(_dir)
     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()
 

code/branches/unity_build/src/libraries/core/CMakeLists.txt

@@ -19 +19 @@
 
 SET_SOURCE_FILES(CORE_SRC_FILES
+
+#BUILD_UNIT CoreStableBuildUnit.cc
+  ClassTreeMask.cc
   CommandLineParser.cc
   ConfigValueContainer.cc
-  Core.cc
   DynLib.cc
   DynLibManager.cc
@@ -28 +30 @@
   GameMode.cc
   GameState.cc
-  GraphicsManager.cc
-  GUIManager.cc
+  Identifier.cc
   Language.cc
+  Loader.cc
   LuaState.cc
+  MetaObjectList.cc
+  Namespace.cc
+  NamespaceNode.cc
   ObjectListBase.cc
   OrxonoxClass.cc
-  Resource.cc
-
-  # hierarchy
-  Identifier.cc
-  MetaObjectList.cc
-
-  # level
-  BaseObject.cc
-  ClassTreeMask.cc
-  Loader.cc
-  Namespace.cc
-  NamespaceNode.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
 
@@ -61 +61 @@
 END_BUILD_UNIT
 
-  # multithreading
-  ThreadPool.cc
 BUILD_UNIT ThreadBuildUnit.cc
   command/TclThreadManager.cc
   Thread.cc
+  ThreadPool.cc
 END_BUILD_UNIT
 )