diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2009-11-20 02:58:42 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2009-11-20 02:58:42 (GMT) |
| commit | 4430bccc700cd8b12164f9d1b5658a14e62dd0d5 (patch) | |
| tree | 8eba965c471e5620fb2957d4fcc340235b503034 /Modules/Platform/Windows-icl.cmake | |
| parent | 1699836b0632b5a16ceac7cfdcc76e0d753e0880 (diff) | |
| download | CMake-4430bccc700cd8b12164f9d1b5658a14e62dd0d5.zip CMake-4430bccc700cd8b12164f9d1b5658a14e62dd0d5.tar.gz CMake-4430bccc700cd8b12164f9d1b5658a14e62dd0d5.tar.bz2 | |
Change the way 32/64 bit compiles are detected with MSVC and intel makefile builds. Use the platform ID preprocessor approach.
Diffstat (limited to 'Modules/Platform/Windows-icl.cmake')
| -rw-r--r-- | Modules/Platform/Windows-icl.cmake | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Modules/Platform/Windows-icl.cmake b/Modules/Platform/Windows-icl.cmake index 2f1ef29..c717c7c 100644 --- a/Modules/Platform/Windows-icl.cmake +++ b/Modules/Platform/Windows-icl.cmake @@ -71,7 +71,11 @@ SET(CMAKE_CXX_STANDARD_LIBRARIES_INIT "${CMAKE_C_STANDARD_LIBRARIES_INIT}") # executable linker flags SET (CMAKE_LINK_DEF_FILE_FLAG "/DEF:") -SET (CMAKE_EXE_LINKER_FLAGS_INIT "/STACK:10000000 /INCREMENTAL:YES") +SET(_MACHINE_ARCH_FLAG ${MSVC_C_ARCHITECTURE_ID}) +IF(NOT _MACHINE_ARCH_FLAG) + SET(_MACHINE_ARCH_FLAG ${MSVC_CXX_ARCHITECTURE_ID}) +ENDIF(NOT _MACHINE_ARCH_FLAG) +SET (CMAKE_EXE_LINKER_FLAGS_INIT "/STACK:10000000 /INCREMENTAL:YES /machine:${_MACHINE_ARCH_FLAG}") SET (CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT "/debug") SET (CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT "/debug") @@ -82,6 +86,7 @@ SET (CMAKE_MODULE_LINKER_FLAGS_INIT ${CMAKE_SHARED_LINKER_FLAGS_INIT}) SET (CMAKE_MODULE_LINKER_FLAGS_DEBUG_INIT ${CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT}) SET (CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO_INIT ${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT}) + INCLUDE(Platform/Windows-Intel) IF(_INTEL_COMPILER_SUPPORTS_MANIFEST) |