Changeset 3330 for code/trunk

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

Files:

• cmake/BuildConfig.cmake (modified) (4 diffs)
• cmake/TargetUtilities.cmake (modified) (1 diff)
• src/CMakeLists.txt (modified) (1 diff)

code/trunk/cmake/BuildConfig.cmake

@@ -25 +25 @@
  #
 
-################# Misc Options ##################
+################# Misc Settings #################
 
 # Standard path suffixes, might not hold everywhere though
@@ -70 +70 @@
 ENDIF()
 
-# Enable expensive optimisations: Use this for a binary release build
-OPTION(ORXONOX_RELEASE "Enable when building restributable releases" FALSE)
-
-# Use WinMain() or main()?
-IF(WIN32)
-  OPTION(ORXONOX_USE_WINMAIN "Use WinMain (doesn't show console) or main" FALSE)
-ENDIF()
 
 ################# OGRE Plugins ##################
@@ -124 +117 @@
 
 
-################# Test options ##################
-
-
 ############# Installation Settings #############
 
@@ -187 +177 @@
 
 
-######## Static/Dynamic linking defines #########
+################ Various options ################
+
+# Enable expensive optimisations: Use this for a binary release build
+OPTION(ORXONOX_RELEASE "Enable when building restributable releases" FALSE)
+
+# Use WinMain() or main()?
+IF(WIN32)
+  OPTION(ORXONOX_USE_WINMAIN "Use WinMain (doesn't show console) or main" FALSE)
+ENDIF()
+
+# Global switch to disable Precompiled Header Files
+IF(PCH_COMPILER_SUPPORT)
+  OPTION(PCH_ENABLE "Global PCH switch" TRUE)
+ENDIF()
+
+
+############ Static/Dynamic linking #############
+
+# Default linking is SHARED
+SET(ORXONOX_DEFAULT_LINK SHARED)
 
 # Disable Boost auto linking completely

code/trunk/cmake/TargetUtilities.cmake

@@ -112 +112 @@
 
   # First part (pre target) of precompiled header files
-  IF(PCH_COMPILER_SUPPORT AND _arg_PCH_FILE)
+  IF(PCH_COMPILER_SUPPORT AND PCH_ENABLE AND _arg_PCH_FILE)
     # Provide convenient option to control PCH
     STRING(TOUPPER "${_target_name}" _target_name_upper)

code/trunk/src/CMakeLists.txt

@@ -30 +30 @@
 # Tolua binding speedup if required
 ADD_COMPILER_FLAGS("-DTOLUA_RELEASE" ORXONOX_RELEASE)
-
-# Default linking is SHARED
-SET(ORXONOX_DEFAULT_LINK SHARED)
 
 ################ OrxonoxConfig.h ################