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

ENH better test for free VC tools

This commit is contained in:
Bill Hoffman 2004-09-03 15:19:58 -04:00
parent 9d19df261d
commit 0d4cd0436b
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Modules/CMakeTestForFreeVC.cxx Normal file
View File

@ -0,0 +1,3 @@
#include<iostream>
int main(){return 0;}

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

@ -73,29 +73,22 @@ IF(CMAKE_GENERATOR MATCHES "NMake Makefiles")
SET(CMAKE_COMPILER_2005 1) SET(CMAKE_COMPILER_2005 1)
ENDIF("${CMAKE_COMPILER_OUTPUT}" MATCHES ".*VERSION=1[4-9][0-9][0-9].*" ) ENDIF("${CMAKE_COMPILER_OUTPUT}" MATCHES ".*VERSION=1[4-9][0-9][0-9].*" )
ENDIF(NOT CMAKE_COMPILER_RETURN) ENDIF(NOT CMAKE_COMPILER_RETURN)
MAKE_DIRECTORY("${CMAKE_BINARY_DIR}/CMakeTmp")
# try to figure out if we are running the free command line # try to figure out if we are running the free command line
# 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.
FILE(WRITE ${CMAKE_BINARY_DIR}/CMakeTmp/testForFreeVC.cxx
"#include<iostream>\n int main(){return 0;}\n")
EXEC_PROGRAM(${CMAKE_CXX_COMPILER} ${CMAKE_BINARY_DIR}/CMakeTmp EXEC_PROGRAM(${CMAKE_CXX_COMPILER} ${CMAKE_BINARY_DIR}/CMakeTmp
ARGS /nologo /MD /EHsc ARGS /nologo /MD /EHsc
\"${CMAKE_BINARY_DIR}/CMakeTmp/testForFreeVC.cxx\" \"${CMAKE_ROOT}/Modules/CMakeTestForFreeVC.cxx\"
OUTPUT_VARIABLE CMAKE_COMPILER_OUTPUT OUTPUT_VARIABLE CMAKE_COMPILER_OUTPUT
RETURN_VALUE CMAKE_COMPILER_RETURN RETURN_VALUE CMAKE_COMPILER_RETURN
) )
MESSAGE("OUTPUT_VARIABLE ${OUTPUT_VARIABLE}")
IF(CMAKE_COMPILER_RETURN) IF(CMAKE_COMPILER_RETURN)
IF("${CMAKE_COMPILER_RETURN}" EQUAL "2") SET(CMAKE_USING_VC_FREE_TOOLS 1)
SET(CMAKE_USING_VC_FREE_TOOLS 1)
ELSE("${CMAKE_COMPILER_RETURN}" EQUAL "2")
SET(CMAKE_USING_VC_FREE_TOOLS 0)
ENDIF("${CMAKE_COMPILER_RETURN}" EQUAL "2")
ELSE(CMAKE_COMPILER_RETURN) ELSE(CMAKE_COMPILER_RETURN)
SET(CMAKE_USING_VC_FREE_TOOLS 0) SET(CMAKE_USING_VC_FREE_TOOLS 0)
ENDIF(CMAKE_COMPILER_RETURN) ENDIF(CMAKE_COMPILER_RETURN)
ENDIF(CMAKE_GENERATOR MATCHES "NMake Makefiles") ENDIF(CMAKE_GENERATOR MATCHES "NMake Makefiles")