diff options
| author | Brad King <brad.king@kitware.com> | 2006-03-30 21:55:19 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2006-03-30 21:55:19 (GMT) |
| commit | f0e8c750d1cb8bab4bd2875cd76361ca4bb09f0a (patch) | |
| tree | 354ebab68a9a4a8a83289c366f90db7a66867bf8 /Modules | |
| parent | eb31755eb204e3c7981961442ef80858cb8d4ff5 (diff) | |
| download | CMake-f0e8c750d1cb8bab4bd2875cd76361ca4bb09f0a.zip CMake-f0e8c750d1cb8bab4bd2875cd76361ca4bb09f0a.tar.gz CMake-f0e8c750d1cb8bab4bd2875cd76361ca4bb09f0a.tar.bz2 | |
BUG: Fixed order of options to cl for 32-bit/64-bit test to work with VS 6 NMake.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/Platform/Windows-cl.cmake | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Modules/Platform/Windows-cl.cmake b/Modules/Platform/Windows-cl.cmake index c004b2f..b401239 100644 --- a/Modules/Platform/Windows-cl.cmake +++ b/Modules/Platform/Windows-cl.cmake @@ -141,10 +141,11 @@ IF(CMAKE_GENERATOR MATCHES "NMake Makefiles") SET(CMAKE_USING_VC_FREE_TOOLS 0) ENDIF(CMAKE_COMPILER_RETURN) MAKE_DIRECTORY("${CMAKE_BINARY_DIR}/CMakeFiles/CMakeTmp3") - MESSAGE(STATUS "Check for CL win64") + MESSAGE(STATUS "Check CL platform") EXEC_PROGRAM(${CMAKE_C_COMPILER} ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeTmp3 - ARGS /nologo /link /machine:i386 + ARGS /nologo \"${testForFreeVCFile}\" + /link /machine:i386 OUTPUT_VARIABLE CMAKE_COMPILER_OUTPUT RETURN_VALUE CMAKE_COMPILER_RETURN ) @@ -154,13 +155,13 @@ IF(CMAKE_GENERATOR MATCHES "NMake Makefiles") ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeOutput.log "Determining if this is a 64 bit system passed:\n" "${CMAKE_COMPILER_OUTPUT}\n\n") - MESSAGE(STATUS "Check if this is a 64 bit system - yes") + MESSAGE(STATUS "Check CL platform - 64 bit") SET(CMAKE_CL_64 1) ELSE(CMAKE_COMPILER_RETURN) FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeOutput.log "Determining if this is a 32 bit system passed:\n" "${CMAKE_COMPILER_OUTPUT}\n\n") - MESSAGE(STATUS "Check if this is 32 bit system - yes") + MESSAGE(STATUS "Check CL platform - 32 bit") SET(CMAKE_CL_64 0) ENDIF(CMAKE_COMPILER_RETURN) ENDIF(NOT CMAKE_VC_COMPILER_TESTS_RUN) |