Changeset 10187

Timestamp:

Jan 10, 2015, 2:48:02 PM (10 years ago)

Author:

landauf

Message:

fixed dependency issue in cmake script (which also fixes a bunch of warnings with cmake 3.1). I hope this works because I don't really understand why it was done like that before.

File:

• code/trunk/cmake/tools/PrecompiledHeaderFiles.cmake (modified) (3 diffs)

code/trunk/cmake/tools/PrecompiledHeaderFiles.cmake

@@ -98 +98 @@
   ELSEIF(CMAKE_COMPILER_IS_GNU)
 
-    SET(_pch_file "${CMAKE_CURRENT_BINARY_DIR}/${_pch_header_filename}.gch")
-    SET(_pch_dep_helper_file "${CMAKE_CURRENT_BINARY_DIR}/${_target_name}PCHDependencyHelper.h")
-
     # Append the gch-dir to make sure gcc finds the pch file
     INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
-
-    # Get compiler flags of the source files (target does not yet exist!)
-    # This is just the best possible opportunity to address this dependency issue
-    GET_GCC_COMPILER_FLAGS(${_target_name} _pch_gcc_flags)
-    # Make sure we recompile the pch file even if only the flags change
-    IF(NOT "${_pch_gcc_flags}" STREQUAL "${_INTERNAL_${_target_name}_PCH_GCC_FLAGS}" OR NOT EXISTS "${_pch_dep_helper_file}")
-      SET(_INTERNAL_${_target_name}_PCH_GCC_FLAGS "${_pch_gcc_flags}" CACHE INTERNAL "")
-      FILE(WRITE ${_pch_dep_helper_file} "/* ${_pch_gcc_flags} */")
-    ENDIF()
 
     # Set Compile flags for the other source files
@@ -136 +124 @@
     IF(CMAKE_COMPILER_IS_GNU)
 
+      SET(_pch_file "${CMAKE_CURRENT_BINARY_DIR}/${_pch_header_filename}.gch")
+      SET(_pch_dep_helper_file "${CMAKE_CURRENT_BINARY_DIR}/${_target_name}PCHDependencyHelper.h")
+
       # Workaround for distcc
       IF(CMAKE_CXX_COMPILER_ARG1)
@@ -142 +133 @@
       ENDIF()
 
-      # Get compiler flags of the source files again (target exists this time)
+      # Get compiler flags of the source files
       GET_GCC_COMPILER_FLAGS(${_target_name} _pch_gcc_flags)
+
+      # Make sure we recompile the pch file even if only the flags change
+      IF(NOT "${_pch_gcc_flags}" STREQUAL "${_INTERNAL_${_target_name}_PCH_GCC_FLAGS}" OR NOT EXISTS "${_pch_dep_helper_file}")
+        SET(_INTERNAL_${_target_name}_PCH_GCC_FLAGS "${_pch_gcc_flags}" CACHE INTERNAL "")
+        FILE(WRITE ${_pch_dep_helper_file} "/* ${_pch_gcc_flags} */")
+      ENDIF()
 
       # Compile the header file