Changeset 8233

Timestamp:

Apr 12, 2011, 3:18:55 PM (14 years ago)

Author:

rgrieder

Message:

Removed config files from individual targets for MSVC because search results turn up 15 times or so.
Instead, added a new target 'config' (for MSVC only) that includes OrxonoxConfig.h and SpecialConfig.h.

Location:

code/branches/kicklib

Files:

• cmake/tools/TargetUtilities.cmake (modified) (2 diffs)
• src/OrxonoxConfig.cmake (modified) (1 diff)

code/branches/kicklib/cmake/tools/TargetUtilities.cmake

@@ -53 +53 @@
  #    This function also installs the target!
  #  Prerequisistes:
- #    ORXONOX_DEFAULT_LINK, ORXONOX_CONFIG_FILES, ORXONOX_CONFIG_FILES_GENERATED
+ #    ORXONOX_DEFAULT_LINK
  #  Parameters:
  #    _target_name, ARGN for the macro arguments
@@ -206 +206 @@
         SOURCE_GROUP("Config" FILES ${CMAKE_CURRENT_SOURCE_DIR}/${_arg_PCH_FILE})
       ENDIF()
-      # Also include all config files
-      LIST(APPEND _${_target_name}_files ${ORXONOX_CONFIG_FILES} ${ORXONOX_CONFIG_FILES_GENERATED})
-      # Add unprocessed config files to the 'Config' section
-      SOURCE_GROUP("Config" FILES ${ORXONOX_CONFIG_FILES})
-      # Add generated config files to the 'Generated' section
-      SOURCE_GROUP("Generated" FILES ${ORXONOX_CONFIG_FILES_GENERATED})
     ENDIF()
   ENDIF()

code/branches/kicklib/src/OrxonoxConfig.cmake

@@ -111 +111 @@
   ${CMAKE_CURRENT_BINARY_DIR}/SpecialConfig.h
 )
+
+# Make special target including the configured header files for Visual Studio
+IF(MSVC)
+  ADD_CUSTOM_TARGET(config
+    SOURCES
+      ${ORXONOX_CONFIG_FILES}
+      ${ORXONOX_CONFIG_FILES_GENERATED}
+  )
+ENDIF()