Changeset 3117 for code/branches

Timestamp:

Jun 3, 2009, 8:40:17 PM (15 years ago)

Author:

rgrieder

Message:

Adding experimental precompiled header file support. It seems to work quite well with MSVC, but has a performance penalty when used with GCC

Location:

code/branches/pch

Files:

• cmake/BuildConfigGCC.cmake (modified) (1 diff)
• cmake/BuildConfigMSVC.cmake (modified) (1 diff)
• cmake/GetGCCCompilerFlags.cmake (added)
• cmake/PrecompiledHeaderFiles.cmake (added)
• cmake/TargetUtilities.cmake (modified) (6 diffs)
• src/orxonox/CMakeLists.txt (modified) (1 diff)
• src/orxonox/OrxonoxPrecompiledHeaders.h (added)

code/branches/pch/cmake/BuildConfigGCC.cmake

@@ -43 +43 @@
 ENDIF()
 
+# GCC only supports PCH in versions 3.4 and above
+INCLUDE(CompareVersionStrings)
+COMPARE_VERSION_STRINGS("${GCC_VERSION}" "3.4.0" _compare_result)
+IF(_compare_result GREATER -1)
+  SET(PCH_COMPILER_SUPPORT TRUE)
+ENDIF()
+
 # Also include environment flags. Could cause conflicts though
 SET_COMPILER_FLAGS("$ENV{CXXFLAGS}" CXX CACHE)

code/branches/pch/cmake/BuildConfigMSVC.cmake

@@ -37 +37 @@
   OPTION(VISUAL_LEAK_DETECTOR_ENABLE "Memory leak detector" FALSE)
 ENDIF(MSVC80)
+
+# Orxonox only supports MSVC 8 and above, which gets asserted above
+SET(PCH_COMPILER_SUPPORT TRUE)
+
 
 #################### Compiler Flags #####################

code/branches/pch/cmake/TargetUtilities.cmake

@@ -34 +34 @@
  #      STATIC/SHARED:     Inherited from ADD_LIBRARY
  #      WIN32:             Inherited from ADD_EXECUTABLE
+ #      PCH_NO_DEFAULT:    Do not make precompiled header files default if
+ #                         specified with PCH_FILE
  #    Lists:
  #      LINK_LIBRARIES:    Redirects to TARGET_LINK_LIBRARIES
@@ -40 +42 @@
  #      DEFINE_SYMBOL:     Sets the DEFINE_SYMBOL target property
  #      TOLUA_FILES:       Files with tolua interface
+ #      PCH_FILE:          Precompiled header file
+ #      PCH_EXCLUDE:       Source files to be excluded from PCH support
  #  Note:
  #    This function also installs the target!
@@ -52 +56 @@
 INCLUDE(ParseMacroArguments)
 INCLUDE(SourceFileUtilities)
+IF(PCH_COMPILER_SUPPORT)
+  INCLUDE(PrecompiledHeaderFiles)
+ENDIF()
 
 FUNCTION(ORXONOX_ADD_LIBRARY _target_name)
@@ -67 +74 @@
   # Specify all possible options (either switch or with add. arguments)
   SET(_switches   FIND_HEADER_FILES  EXCLUDE_FROM_ALL  ORXONOX_EXTERNAL
-                  NO_DLL_INTERFACE   NO_SOURCE_GROUPS  ${_additional_switches})
+                  NO_DLL_INTERFACE   NO_SOURCE_GROUPS  ${_additional_switches}
+                  PCH_NO_DEFAULT)
   SET(_list_names LINK_LIBRARIES  VERSION   SOURCE_FILES  DEFINE_SYMBOL
-                  TOLUA_FILES)
+                  TOLUA_FILES     PCH_FILE  PCH_EXCLUDE)
   PARSE_MACRO_ARGUMENTS("${_switches}" "${_list_names}" ${ARGN})
 
@@ -101 +109 @@
     GENERATE_TOLUA_BINDINGS(${_target_name_capitalised} _${_target_name}_files
                             INPUTFILES ${_arg_TOLUA_FILES})
+  ENDIF()
+
+  # First part (pre target) of precompiled header files
+  IF(PCH_COMPILER_SUPPORT AND _arg_PCH_FILE)
+    # Provide convenient option to control PCH
+    STRING(TOUPPER "${_target_name}" _target_name_upper)
+    IF(_arg_PCH_NO_DEFAULT)
+      SET(PCH_DEFAULT FALSE)
+    ELSE()
+      SET(PCH_DEFAULT TRUE)
+    ENDIF()
+    OPTION(PCH_ENABLE_${_target_name_upper} "Enable using precompiled header files for library ${_target_name}." ${PCH_DEFAULT})
+
+    IF(PCH_ENABLE_${_target_name_upper})
+      PRECOMPILED_HEADER_FILES_PRE_TARGET(${_target_name} ${_arg_PCH_FILE} _${_target_name}_files EXCLUDE ${_arg_PCH_EXCLUDE})
+    ENDIF()
   ENDIF()
 
@@ -144 +168 @@
   ENDIF()
 
+  # Second part of precompiled header files
+  IF(PCH_COMPILER_SUPPORT AND PCH_ENABLE_${_target_name_upper} AND _arg_PCH_FILE)
+    PRECOMPILED_HEADER_FILES_POST_TARGET(${_target_name} ${_arg_PCH_FILE})
+  ENDIF()
+
   IF(NOT _arg_STATIC)
     INSTALL(TARGETS ${_target_name}

code/branches/pch/src/orxonox/CMakeLists.txt

@@ -41 +41 @@
     objects/quest/QuestDescription.h
     objects/quest/QuestManager.h
+  PCH_FILE
+    OrxonoxPrecompiledHeaders.h
+  PCH_NO_DEFAULT
   LINK_LIBRARIES
     ${OGRE_LIBRARY}