diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2005-01-17 20:20:41 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2005-01-17 20:20:41 (GMT) |
| commit | e7bc462755b72af9ecf8869a295619bc36108a67 (patch) | |
| tree | 346d9d1a3940df246e099071ef0d0206f09cf062 /Modules | |
| parent | 64f4880cb56887935c7490c0a225dc7182b832c5 (diff) | |
| download | CMake-e7bc462755b72af9ecf8869a295619bc36108a67.zip CMake-e7bc462755b72af9ecf8869a295619bc36108a67.tar.gz CMake-e7bc462755b72af9ecf8869a295619bc36108a67.tar.bz2 | |
BUG: fix running of cl in trycompiles
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeCCompiler.cmake.in | 6 | ||||
| -rw-r--r-- | Modules/CMakeCXXCompiler.cmake.in | 7 | ||||
| -rw-r--r-- | Modules/Platform/Windows-cl.cmake | 2 |
3 files changed, 14 insertions, 1 deletions
diff --git a/Modules/CMakeCCompiler.cmake.in b/Modules/CMakeCCompiler.cmake.in index 9ce0962..1ed00bf 100644 --- a/Modules/CMakeCCompiler.cmake.in +++ b/Modules/CMakeCCompiler.cmake.in @@ -10,6 +10,12 @@ IF(CMAKE_COMPILER_IS_CYGWIN) SET(UNIX 1) ENDIF(CMAKE_COMPILER_IS_CYGWIN) +SET(CMAKE_VC_COMPILER_TESTS_RUN 1) +SET(CMAKE_COMPILER_SUPPORTS_PDBTYPE @CMAKE_COMPILER_SUPPORTS_PDBTYPE@) +SET(CMAKE_COMPILER_2005 @CMAKE_COMPILER_2005@) +SET(CMAKE_USING_VC_FREE_TOOLS @CMAKE_USING_VC_FREE_TOOLS@) + + IF(CMAKE_COMPILER_IS_MINGW) SET(MINGW 1) ENDIF(CMAKE_COMPILER_IS_MINGW) diff --git a/Modules/CMakeCXXCompiler.cmake.in b/Modules/CMakeCXXCompiler.cmake.in index 1b72a76..965bde4 100644 --- a/Modules/CMakeCXXCompiler.cmake.in +++ b/Modules/CMakeCXXCompiler.cmake.in @@ -2,6 +2,13 @@ SET(CMAKE_CXX_COMPILER "@CMAKE_CXX_COMPILER@") SET(CMAKE_COMPILER_IS_GNUCXX @CMAKE_COMPILER_IS_GNUCXX@) SET(CMAKE_CXX_COMPILER_LOADED 1) SET(CMAKE_COMPILER_IS_GNUCC_RUN 1) + +SET(CMAKE_VC_COMPILER_TESTS_RUN 1) +SET(CMAKE_COMPILER_SUPPORTS_PDBTYPE @CMAKE_COMPILER_SUPPORTS_PDBTYPE@) +SET(CMAKE_COMPILER_2005 @CMAKE_COMPILER_2005@) +SET(CMAKE_USING_VC_FREE_TOOLS @CMAKE_USING_VC_FREE_TOOLS@) + + SET(CMAKE_CXX_IGNORE_EXTENSIONS h;H;o;O;obj;OBJ;def;DEF;rc;RC) SET(CMAKE_CXX_SOURCE_FILE_EXTENSIONS C;M;c++;cc;cpp;cxx;m;mm) SET(CMAKE_CXX_LINKER_PREFERENCE Prefered) diff --git a/Modules/Platform/Windows-cl.cmake b/Modules/Platform/Windows-cl.cmake index 32f8396..d864a11 100644 --- a/Modules/Platform/Windows-cl.cmake +++ b/Modules/Platform/Windows-cl.cmake @@ -80,7 +80,7 @@ IF(CMAKE_GENERATOR MATCHES "NMake Makefiles") # tools from Microsoft. These tools do not provide debug libraries, # so the link flags used have to be different. MAKE_DIRECTORY("${CMAKE_BINARY_DIR}/CMakeTmp2") - EXEC_PROGRAM(${CMAKE_CXX_COMPILER} ${CMAKE_BINARY_DIR}/CMakeTmp2 + EXEC_PROGRAM(${CMAKE_C_COMPILER} ${CMAKE_BINARY_DIR}/CMakeTmp2 ARGS /nologo /MD /EHsc \"${CMAKE_ROOT}/Modules/CMakeTestForFreeVC.cxx\" OUTPUT_VARIABLE CMAKE_COMPILER_OUTPUT |