Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7980 for code/branches/kicklib


Ignore:
Timestamp:
Feb 27, 2011, 5:43:12 AM (14 years ago)
Author:
rgrieder
Message:

Moved PCH and Config files to more appropriate places in the MSVC solution.

Location:
code/branches/kicklib
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/kicklib/cmake/tools/TargetUtilities.cmake

    r7818 r7980  
    5353 #    This function also installs the target!
    5454 #  Prerequisistes:
    55  #    ORXONOX_DEFAULT_LINK, ORXONOX_CONFIG_FILES
     55 #    ORXONOX_DEFAULT_LINK, ORXONOX_CONFIG_FILES, ORXONOX_CONFIG_FILES_GENERATED
    5656 #  Parameters:
    5757 #    _target_name, ARGN for the macro arguments
     
    192192
    193193    IF(NOT _arg_ORXONOX_EXTERNAL)
    194       # Move the prereqs.h file to the config section
     194      # Move the ...Prereqs.h and the PCH files to the 'Config' section
    195195      IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${_target_name_capitalised}Prereqs.h)
    196196        SOURCE_GROUP("Config" FILES ${_target_name_capitalised}Prereqs.h)
    197197      ENDIF()
    198       # Add config files to the config section
    199       LIST(APPEND _${_target_name}_files ${ORXONOX_CONFIG_FILES})
     198      IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${_arg_PCH_FILE})
     199        SOURCE_GROUP("Config" FILES ${CMAKE_CURRENT_SOURCE_DIR}/${_arg_PCH_FILE})
     200      ENDIF()
     201      # Also include all config files
     202      LIST(APPEND _${_target_name}_files ${ORXONOX_CONFIG_FILES} ${ORXONOX_CONFIG_FILES_GENERATED})
     203      # Add unprocessed config files to the 'Config' section
    200204      SOURCE_GROUP("Config" FILES ${ORXONOX_CONFIG_FILES})
     205      # Add generated config files to the 'Generated' section
     206      SOURCE_GROUP("Generated" FILES ${ORXONOX_CONFIG_FILES_GENERATED})
    201207    ENDIF()
    202208  ENDIF()
  • code/branches/kicklib/src/OrxonoxConfig.cmake

    r7818 r7980  
    106106
    107107SET(ORXONOX_CONFIG_FILES
    108   ${CMAKE_CURRENT_BINARY_DIR}/OrxonoxConfig.h
    109108  ${CMAKE_CURRENT_SOURCE_DIR}/OrxonoxConfig.h.in
    110   ${CMAKE_CURRENT_BINARY_DIR}/SpecialConfig.h
    111109  ${CMAKE_CURRENT_SOURCE_DIR}/SpecialConfig.h.in
    112110)
     111SET(ORXONOX_CONFIG_FILES_GENERATED
     112  ${CMAKE_CURRENT_BINARY_DIR}/OrxonoxConfig.h
     113  ${CMAKE_CURRENT_BINARY_DIR}/SpecialConfig.h
     114)
Note: See TracChangeset for help on using the changeset viewer.