Changeset 8650 for code/branches/unity_build/cmake

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/cmake/tools

Files:

• GenerateToluaBindings.cmake (modified) (1 diff)
• TargetUtilities.cmake (modified) (2 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()