Changeset 7415

Timestamp:

Sep 11, 2010, 8:20:30 PM (14 years ago)

Author:

rgrieder

Message:

Placing all generated files in source group "Generated" for MSVC instead of different groups for PCH, Tolua and Compilations.

Location:

code/trunk/cmake/tools

Files:

• GenerateToluaBindings.cmake (modified) (1 diff)
• SourceFileUtilities.cmake (modified) (1 diff)
• TargetUtilities.cmake (modified) (3 diffs)

code/trunk/cmake/tools/GenerateToluaBindings.cmake

@@ -47 +47 @@
     PARENT_SCOPE
   )
-  SOURCE_GROUP("Tolua" FILES ${_tolua_cxxfile} ${_tolua_hfile})
+
   # Disable annoying GCC warnings
   IF(CMAKE_COMPILER_IS_GNU)
     SET_SOURCE_FILES_PROPERTIES(${_tolua_cxxfile} PROPERTIES COMPILE_FLAGS "-w")
   ENDIF()
+
   # Tolua binding speedup if required
   IF(ORXONOX_RELEASE)

code/trunk/cmake/tools/SourceFileUtilities.cmake

@@ -118 +118 @@
       SOURCE_GROUP("Source\\${_group_path}" FILES ${_file})
     ELSE()
-      # Has to be a compilation
-      SOURCE_GROUP("Compilations" FILES ${_file})
+      # File is being generated in the binary directory
+      SOURCE_GROUP("Generated" FILES ${_file})
     ENDIF()
   ENDFOREACH(_file)

code/trunk/cmake/tools/TargetUtilities.cmake

@@ -84 +84 @@
                   NO_DLL_INTERFACE   NO_SOURCE_GROUPS  PCH_NO_DEFAULT 
                   NO_INSTALL         NO_VERSION        ${_additional_switches})
-  SET(_list_names LINK_LIBRARIES  VERSION   SOURCE_FILES  DEFINE_SYMBOL
-                  TOLUA_FILES     PCH_FILE  PCH_EXCLUDE   OUTPUT_NAME)
+  SET(_list_names LINK_LIBRARIES     VERSION           SOURCE_FILES
+                  DEFINE_SYMBOL      TOLUA_FILES       PCH_FILE
+                  PCH_EXCLUDE        OUTPUT_NAME)
+
   PARSE_MACRO_ARGUMENTS("${_switches}" "${_list_names}" ${ARGN})
 
@@ -105 +107 @@
   ENDIF()
 
+  # Combine source and header files
+  SET(_${_target_name}_files
+    ${_${_target_name}_header_files}
+    ${_${_target_name}_source_files}
+  )
   # Remove potential duplicates
-  SET(_${_target_name}_files ${_${_target_name}_header_files} ${_${_target_name}_source_files})
   LIST(REMOVE_DUPLICATES _${_target_name}_files)
-
-  # Generate the source groups
-  IF(NOT _arg_NO_SOURCE_GROUPS)
-    GENERATE_SOURCE_GROUPS(${_${_target_name}_files})
-
-    IF(NOT _arg_ORXONOX_EXTERNAL)
-      # Move the prereqs.h file to the config section
-      IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${_target_name_capitalised}Prereqs.h)
-        SOURCE_GROUP("Config" FILES ${_target_name_capitalised}Prereqs.h)
-      ENDIF()
-      # Add the config files in a special source group
-      LIST(APPEND _${_target_name}_files ${ORXONOX_CONFIG_FILES})
-      SOURCE_GROUP("Config" FILES ${ORXONOX_CONFIG_FILES})
-    ENDIF()
-  ENDIF(NOT _arg_NO_SOURCE_GROUPS)
 
   # TOLUA_FILES
@@ -145 +136 @@
     ENDIF()
   ENDIF()
+
+  # Generate the source groups
+  IF(MSVC AND NOT _arg_NO_SOURCE_GROUPS)
+    GENERATE_SOURCE_GROUPS(${_${_target_name}_files})
+
+    IF(NOT _arg_ORXONOX_EXTERNAL)
+      # Move the prereqs.h file to the config section
+      IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${_target_name_capitalised}Prereqs.h)
+        SOURCE_GROUP("Config" FILES ${_target_name_capitalised}Prereqs.h)
+      ENDIF()
+      # Add config files to the config section
+      LIST(APPEND _${_target_name}_files ${ORXONOX_CONFIG_FILES})
+      SOURCE_GROUP("Config" FILES ${ORXONOX_CONFIG_FILES})
+    ENDIF()
+  ENDIF(NOT _arg_NO_SOURCE_GROUPS)
 
   # Set link mode (SHARED/STATIC)