[Orxonox-commit 3547] r8233 - in code/branches/kicklib: cmake/tools src

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2011-04-12 15:18:55 +0200 (Tue, 12 Apr 2011)
New Revision: 8233

Modified:
   code/branches/kicklib/cmake/tools/TargetUtilities.cmake
   code/branches/kicklib/src/OrxonoxConfig.cmake
Log:
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.

Modified: code/branches/kicklib/cmake/tools/TargetUtilities.cmake
===================================================================
--- code/branches/kicklib/cmake/tools/TargetUtilities.cmake	2011-04-11 17:37:00 UTC (rev 8232)
+++ code/branches/kicklib/cmake/tools/TargetUtilities.cmake	2011-04-12 13:18:55 UTC (rev 8233)
@@ -52,7 +52,7 @@
  #  Note:
  #    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
  #
@@ -205,12 +205,6 @@
       IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${_arg_PCH_FILE})
         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()
 

Modified: code/branches/kicklib/src/OrxonoxConfig.cmake
===================================================================
--- code/branches/kicklib/src/OrxonoxConfig.cmake	2011-04-11 17:37:00 UTC (rev 8232)
+++ code/branches/kicklib/src/OrxonoxConfig.cmake	2011-04-12 13:18:55 UTC (rev 8233)
@@ -110,3 +110,12 @@
   ${CMAKE_CURRENT_BINARY_DIR}/OrxonoxConfig.h
   ${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()