[Cmake-commits] [cmake-commits] hoffman committed CMakeTestCCompiler.cmake 1.25 1.26 CMakeTestCXXCompiler.cmake 1.19 1.20
cmake-commits at cmake.org
cmake-commits at cmake.org
Sat Apr 18 14:37:06 EDT 2009
Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv12221
Modified Files:
CMakeTestCCompiler.cmake CMakeTestCXXCompiler.cmake
Log Message:
BUG: fix cmake so that if you configure with a bad env for cl, then with a good path, it will configure correctly
Index: CMakeTestCCompiler.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeTestCCompiler.cmake,v
retrieving revision 1.25
retrieving revision 1.26
diff -C 2 -d -r1.25 -r1.26
*** CMakeTestCCompiler.cmake 14 Feb 2008 15:50:43 -0000 1.25
--- CMakeTestCCompiler.cmake 18 Apr 2009 18:37:03 -0000 1.26
***************
*** 30,33 ****
--- 30,38 ----
"Determining if the C compiler works failed with "
"the following output:\n${OUTPUT}\n\n")
+ # if the compiler is broken make sure to remove the platform file
+ # since Windows-cl configures both c/cxx files both need to be removed
+ # when c or c++ fails
+ FILE(REMOVE ${CMAKE_PLATFORM_ROOT_BIN}/CMakeCPlatform.cmake )
+ FILE(REMOVE ${CMAKE_PLATFORM_ROOT_BIN}/CMakeCXXPlatform.cmake )
MESSAGE(FATAL_ERROR "The C compiler \"${CMAKE_C_COMPILER}\" "
"is not able to compile a simple test program.\nIt fails "
Index: CMakeTestCXXCompiler.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeTestCXXCompiler.cmake,v
retrieving revision 1.19
retrieving revision 1.20
diff -C 2 -d -r1.19 -r1.20
*** CMakeTestCXXCompiler.cmake 14 Feb 2008 15:50:43 -0000 1.19
--- CMakeTestCXXCompiler.cmake 18 Apr 2009 18:37:04 -0000 1.20
***************
*** 20,23 ****
--- 20,28 ----
IF(NOT CMAKE_CXX_COMPILER_WORKS)
MESSAGE(STATUS "Check for working CXX compiler: ${CMAKE_CXX_COMPILER} -- broken")
+ # if the compiler is broken make sure to remove the platform file
+ # since Windows-cl configures both c/cxx files both need to be removed
+ # when c or c++ fails
+ FILE(REMOVE ${CMAKE_PLATFORM_ROOT_BIN}/CMakeCPlatform.cmake )
+ FILE(REMOVE ${CMAKE_PLATFORM_ROOT_BIN}/CMakeCXXPlatform.cmake )
FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
"Determining if the CXX compiler works failed with "
More information about the Cmake-commits
mailing list