From f0e8c750d1cb8bab4bd2875cd76361ca4bb09f0a Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 30 Mar 2006 16:55:19 -0500 Subject: [PATCH] BUG: Fixed order of options to cl for 32-bit/64-bit test to work with VS 6 NMake. --- Modules/Platform/Windows-cl.cmake | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Modules/Platform/Windows-cl.cmake b/Modules/Platform/Windows-cl.cmake index c004b2f02..b4012395f 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)