[cmake-commits] king committed CMakeDetermineCCompiler.cmake 1.49 1.50 CMakeDetermineCXXCompiler.cmake 1.42 1.43 CMakeDetermineFortranCompiler.cmake 1.20 1.21 CMakeTestCCompiler.cmake 1.23 1.24 CMakeTestCXXCompiler.cmake 1.17 1.18

cmake-commits at cmake.org cmake-commits at cmake.org
Mon Feb 4 10:04:25 EST 2008


Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv32630/Modules

Modified Files:
	CMakeDetermineCCompiler.cmake CMakeDetermineCXXCompiler.cmake 
	CMakeDetermineFortranCompiler.cmake CMakeTestCCompiler.cmake 
	CMakeTestCXXCompiler.cmake 
Log Message:
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.


Index: CMakeTestCCompiler.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeTestCCompiler.cmake,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- CMakeTestCCompiler.cmake	3 Feb 2008 22:24:50 -0000	1.23
+++ CMakeTestCCompiler.cmake	4 Feb 2008 15:04:23 -0000	1.24
@@ -52,7 +52,7 @@
     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)

Index: CMakeDetermineFortranCompiler.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeDetermineFortranCompiler.cmake,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- CMakeDetermineFortranCompiler.cmake	3 Feb 2008 22:24:50 -0000	1.20
+++ CMakeDetermineFortranCompiler.cmake	4 Feb 2008 15:04:23 -0000	1.21
@@ -136,5 +136,6 @@
 # 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")

Index: CMakeTestCXXCompiler.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeTestCXXCompiler.cmake,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- CMakeTestCXXCompiler.cmake	3 Feb 2008 22:24:50 -0000	1.17
+++ CMakeTestCXXCompiler.cmake	4 Feb 2008 15:04:23 -0000	1.18
@@ -45,7 +45,7 @@
     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)

Index: CMakeDetermineCXXCompiler.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeDetermineCXXCompiler.cmake,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- CMakeDetermineCXXCompiler.cmake	3 Feb 2008 22:24:50 -0000	1.42
+++ CMakeDetermineCXXCompiler.cmake	4 Feb 2008 15:04:23 -0000	1.43
@@ -142,7 +142,8 @@
 
 # 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")

Index: CMakeDetermineCCompiler.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeDetermineCCompiler.cmake,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- CMakeDetermineCCompiler.cmake	3 Feb 2008 22:24:50 -0000	1.49
+++ CMakeDetermineCCompiler.cmake	4 Feb 2008 15:04:23 -0000	1.50
@@ -132,7 +132,8 @@
 
 # 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")



More information about the Cmake-commits mailing list