kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: fix running of cl in trycompiles

This commit is contained in:
Bill Hoffman 2005-01-17 15:20:41 -05:00
parent 64f4880cb5
commit e7bc462755
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Modules/CMakeCCompiler.cmake.in
View File

@ -10,6 +10,12 @@ IF(CMAKE_COMPILER_IS_CYGWIN)
SET(UNIX 1) SET(UNIX 1)
ENDIF(CMAKE_COMPILER_IS_CYGWIN) 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) IF(CMAKE_COMPILER_IS_MINGW)
SET(MINGW 1) SET(MINGW 1)
ENDIF(CMAKE_COMPILER_IS_MINGW) ENDIF(CMAKE_COMPILER_IS_MINGW)

7
Modules/CMakeCXXCompiler.cmake.in
View File

@ -2,6 +2,13 @@ SET(CMAKE_CXX_COMPILER "@CMAKE_CXX_COMPILER@")
SET(CMAKE_COMPILER_IS_GNUCXX @CMAKE_COMPILER_IS_GNUCXX@) SET(CMAKE_COMPILER_IS_GNUCXX @CMAKE_COMPILER_IS_GNUCXX@)
SET(CMAKE_CXX_COMPILER_LOADED 1) SET(CMAKE_CXX_COMPILER_LOADED 1)
SET(CMAKE_COMPILER_IS_GNUCC_RUN 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_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_SOURCE_FILE_EXTENSIONS C;M;c++;cc;cpp;cxx;m;mm)
SET(CMAKE_CXX_LINKER_PREFERENCE Prefered) SET(CMAKE_CXX_LINKER_PREFERENCE Prefered)

2
Modules/Platform/Windows-cl.cmake
View File

@ -80,7 +80,7 @@ IF(CMAKE_GENERATOR MATCHES "NMake Makefiles")
# tools from Microsoft. These tools do not provide debug libraries, # tools from Microsoft. These tools do not provide debug libraries,
# so the link flags used have to be different. # so the link flags used have to be different.
MAKE_DIRECTORY("${CMAKE_BINARY_DIR}/CMakeTmp2") 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 ARGS /nologo /MD /EHsc
\"${CMAKE_ROOT}/Modules/CMakeTestForFreeVC.cxx\" \"${CMAKE_ROOT}/Modules/CMakeTestForFreeVC.cxx\"
OUTPUT_VARIABLE CMAKE_COMPILER_OUTPUT OUTPUT_VARIABLE CMAKE_COMPILER_OUTPUT