diff options
| author | Brad King <brad.king@kitware.com> | 2008-02-04 15:04:23 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2008-02-04 15:04:23 (GMT) |
| commit | c12a7e388d449e96107ba1eea8b8b2f2469ec20f (patch) | |
| tree | 46a1f1d7416b3458a5e2094dd990d1aee8aa8ff1 | |
| parent | e67dc68a3b18f3fb1f7adcb752588c2717dc1986 (diff) | |
| download | CMake-c12a7e388d449e96107ba1eea8b8b2f2469ec20f.zip CMake-c12a7e388d449e96107ba1eea8b8b2f2469ec20f.tar.gz CMake-c12a7e388d449e96107ba1eea8b8b2f2469ec20f.tar.bz2 | |
BUG: When configuring compiler information files into the CMakeFiles directory in the project build tree, use IMMEDIATE option for CONFIGURE_FILE explicitly. It is needed in case the user sets CMAKE_BACKWARDS_COMPATIBILITY to 2.0 or lower.
| -rw-r--r-- | Modules/CMakeDetermineCCompiler.cmake | 5 | ||||
| -rw-r--r-- | Modules/CMakeDetermineCXXCompiler.cmake | 5 | ||||
| -rw-r--r-- | Modules/CMakeDetermineFortranCompiler.cmake | 3 | ||||
| -rw-r--r-- | Modules/CMakeTestCCompiler.cmake | 2 | ||||
| -rw-r--r-- | Modules/CMakeTestCXXCompiler.cmake | 2 |
5 files changed, 10 insertions, 7 deletions
diff --git a/Modules/CMakeDetermineCCompiler.cmake b/Modules/CMakeDetermineCCompiler.cmake index 0f88f89..610ec6c 100644 --- a/Modules/CMakeDetermineCCompiler.cmake +++ b/Modules/CMakeDetermineCCompiler.cmake @@ -132,7 +132,8 @@ INCLUDE(CMakeFindBinUtils) # configure variables set in this file for fast reload later on CONFIGURE_FILE(${CMAKE_ROOT}/Modules/CMakeCCompiler.cmake.in - "${CMAKE_PLATFORM_ROOT_BIN}/CMakeCCompiler.cmake" - @ONLY) + "${CMAKE_PLATFORM_ROOT_BIN}/CMakeCCompiler.cmake" + @ONLY IMMEDIATE # IMMEDIATE must be here for compatibility mode <= 2.0 + ) SET(CMAKE_C_COMPILER_ENV_VAR "CC") diff --git a/Modules/CMakeDetermineCXXCompiler.cmake b/Modules/CMakeDetermineCXXCompiler.cmake index bb5ff74..2286bfa 100644 --- a/Modules/CMakeDetermineCXXCompiler.cmake +++ b/Modules/CMakeDetermineCXXCompiler.cmake @@ -142,7 +142,8 @@ INCLUDE(CMakeFindBinUtils) # configure all variables set in this file CONFIGURE_FILE(${CMAKE_ROOT}/Modules/CMakeCXXCompiler.cmake.in - ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeCXXCompiler.cmake - @ONLY) + ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeCXXCompiler.cmake + @ONLY IMMEDIATE # IMMEDIATE must be here for compatibility mode <= 2.0 + ) SET(CMAKE_CXX_COMPILER_ENV_VAR "CXX") diff --git a/Modules/CMakeDetermineFortranCompiler.cmake b/Modules/CMakeDetermineFortranCompiler.cmake index 9623b61..bb80e6f 100644 --- a/Modules/CMakeDetermineFortranCompiler.cmake +++ b/Modules/CMakeDetermineFortranCompiler.cmake @@ -136,5 +136,6 @@ INCLUDE(CMakeFindBinUtils) # configure variables set in this file for fast reload later on CONFIGURE_FILE(${CMAKE_ROOT}/Modules/CMakeFortranCompiler.cmake.in ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeFortranCompiler.cmake - @ONLY) + @ONLY IMMEDIATE # IMMEDIATE must be here for compatibility mode <= 2.0 + ) SET(CMAKE_Fortran_COMPILER_ENV_VAR "FC") diff --git a/Modules/CMakeTestCCompiler.cmake b/Modules/CMakeTestCCompiler.cmake index b3a4b0d..4499e60 100644 --- a/Modules/CMakeTestCCompiler.cmake +++ b/Modules/CMakeTestCCompiler.cmake @@ -52,7 +52,7 @@ ELSE(NOT CMAKE_C_COMPILER_WORKS) CONFIGURE_FILE( ${CMAKE_ROOT}/Modules/CMakeCCompiler.cmake.in ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeCCompiler.cmake - @ONLY + @ONLY IMMEDIATE # IMMEDIATE must be here for compatibility mode <= 2.0 ) ENDIF(CMAKE_C_COMPILER_FORCED) ENDIF(NOT CMAKE_C_COMPILER_WORKS) diff --git a/Modules/CMakeTestCXXCompiler.cmake b/Modules/CMakeTestCXXCompiler.cmake index 043186b..9c2305f 100644 --- a/Modules/CMakeTestCXXCompiler.cmake +++ b/Modules/CMakeTestCXXCompiler.cmake @@ -45,7 +45,7 @@ ELSE(NOT CMAKE_CXX_COMPILER_WORKS) CONFIGURE_FILE( ${CMAKE_ROOT}/Modules/CMakeCXXCompiler.cmake.in ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeCXXCompiler.cmake - @ONLY + @ONLY IMMEDIATE # IMMEDIATE must be here for compatibility mode <= 2.0 ) ENDIF(CMAKE_CXX_COMPILER_FORCED) ENDIF(NOT CMAKE_CXX_COMPILER_WORKS) |