Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3330 for code/trunk/cmake


Ignore:
Timestamp:
Jul 21, 2009, 11:53:13 AM (15 years ago)
Author:
rgrieder
Message:

Added general PCH_ENABLE option in CMake to disable PCH with one simple option (use cmake -DPCH_ENABLE=FALSE when configuring).
Also moved all build-related options to BuildConfig and moved some code around there.

Location:
code/trunk/cmake
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/cmake/BuildConfig.cmake

    r3323 r3330  
    2525 #
    2626
    27 ################# Misc Options ##################
     27################# Misc Settings #################
    2828
    2929# Standard path suffixes, might not hold everywhere though
     
    7070ENDIF()
    7171
    72 # Enable expensive optimisations: Use this for a binary release build
    73 OPTION(ORXONOX_RELEASE "Enable when building restributable releases" FALSE)
    74 
    75 # Use WinMain() or main()?
    76 IF(WIN32)
    77   OPTION(ORXONOX_USE_WINMAIN "Use WinMain (doesn't show console) or main" FALSE)
    78 ENDIF()
    7972
    8073################# OGRE Plugins ##################
     
    124117
    125118
    126 ################# Test options ##################
    127 
    128 
    129119############# Installation Settings #############
    130120
     
    187177
    188178
    189 ######## Static/Dynamic linking defines #########
     179################ Various options ################
     180
     181# Enable expensive optimisations: Use this for a binary release build
     182OPTION(ORXONOX_RELEASE "Enable when building restributable releases" FALSE)
     183
     184# Use WinMain() or main()?
     185IF(WIN32)
     186  OPTION(ORXONOX_USE_WINMAIN "Use WinMain (doesn't show console) or main" FALSE)
     187ENDIF()
     188
     189# Global switch to disable Precompiled Header Files
     190IF(PCH_COMPILER_SUPPORT)
     191  OPTION(PCH_ENABLE "Global PCH switch" TRUE)
     192ENDIF()
     193
     194
     195############ Static/Dynamic linking #############
     196
     197# Default linking is SHARED
     198SET(ORXONOX_DEFAULT_LINK SHARED)
    190199
    191200# Disable Boost auto linking completely
  • code/trunk/cmake/TargetUtilities.cmake

    r3196 r3330  
    112112
    113113  # First part (pre target) of precompiled header files
    114   IF(PCH_COMPILER_SUPPORT AND _arg_PCH_FILE)
     114  IF(PCH_COMPILER_SUPPORT AND PCH_ENABLE AND _arg_PCH_FILE)
    115115    # Provide convenient option to control PCH
    116116    STRING(TOUPPER "${_target_name}" _target_name_upper)
Note: See TracChangeset for help on using the changeset viewer.