[Orxonox-commit 3291] r7980 - in code/branches/kicklib: cmake/tools src

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2011-02-27 05:43:12 +0100 (Sun, 27 Feb 2011)
New Revision: 7980

Modified:
   code/branches/kicklib/cmake/tools/TargetUtilities.cmake
   code/branches/kicklib/src/OrxonoxConfig.cmake
Log:
Moved PCH and Config files to more appropriate places in the MSVC solution.

Modified: code/branches/kicklib/cmake/tools/TargetUtilities.cmake
===================================================================
--- code/branches/kicklib/cmake/tools/TargetUtilities.cmake	2011-02-27 02:42:08 UTC (rev 7979)
+++ code/branches/kicklib/cmake/tools/TargetUtilities.cmake	2011-02-27 04:43:12 UTC (rev 7980)
@@ -52,7 +52,7 @@
  #  Note:
  #    This function also installs the target!
  #  Prerequisistes:
- #    ORXONOX_DEFAULT_LINK, ORXONOX_CONFIG_FILES
+ #    ORXONOX_DEFAULT_LINK, ORXONOX_CONFIG_FILES, ORXONOX_CONFIG_FILES_GENERATED
  #  Parameters:
  #    _target_name, ARGN for the macro arguments
  #
@@ -191,13 +191,19 @@
     GENERATE_SOURCE_GROUPS(${_${_target_name}_files})
 
     IF(NOT _arg_ORXONOX_EXTERNAL)
-      # Move the prereqs.h file to the config section
+      # Move the ...Prereqs.h and the PCH files 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})
+      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-02-27 02:42:08 UTC (rev 7979)
+++ code/branches/kicklib/src/OrxonoxConfig.cmake	2011-02-27 04:43:12 UTC (rev 7980)
@@ -105,8 +105,10 @@
 CONFIGURE_FILE(SpecialConfig.h.in ${CMAKE_CURRENT_BINARY_DIR}/SpecialConfig.h)
 
 SET(ORXONOX_CONFIG_FILES
-  ${CMAKE_CURRENT_BINARY_DIR}/OrxonoxConfig.h
   ${CMAKE_CURRENT_SOURCE_DIR}/OrxonoxConfig.h.in
-  ${CMAKE_CURRENT_BINARY_DIR}/SpecialConfig.h
   ${CMAKE_CURRENT_SOURCE_DIR}/SpecialConfig.h.in
 )
+SET(ORXONOX_CONFIG_FILES_GENERATED
+  ${CMAKE_CURRENT_BINARY_DIR}/OrxonoxConfig.h
+  ${CMAKE_CURRENT_BINARY_DIR}/SpecialConfig.h
+)