diff options
| author | Brad King <brad.king@kitware.com> | 2014-08-13 18:44:52 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-08-13 18:47:54 (GMT) |
| commit | d7866c52c9fc7f28990337a965e8d9e6652b0ac5 (patch) | |
| tree | a247a13143b7354b85c71fdb8e98489db3306281 /Modules/CMakeDetermineASM_MASMCompiler.cmake | |
| parent | 0374abdb18135bfb9f1b88c8f6be17c160fb8b4a (diff) | |
| download | CMake-d7866c52c9fc7f28990337a965e8d9e6652b0ac5.zip CMake-d7866c52c9fc7f28990337a965e8d9e6652b0ac5.tar.gz CMake-d7866c52c9fc7f28990337a965e8d9e6652b0ac5.tar.bz2 | |
ASM_MASM: Fix selection of ml64
Recognize 64-bit platforms based on the C or CXX architecture or
the platform specified with a VS generator name.
Diffstat (limited to 'Modules/CMakeDetermineASM_MASMCompiler.cmake')
| -rw-r--r-- | Modules/CMakeDetermineASM_MASMCompiler.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Modules/CMakeDetermineASM_MASMCompiler.cmake b/Modules/CMakeDetermineASM_MASMCompiler.cmake index 665a65c..142ef95 100644 --- a/Modules/CMakeDetermineASM_MASMCompiler.cmake +++ b/Modules/CMakeDetermineASM_MASMCompiler.cmake @@ -17,7 +17,8 @@ set(ASM_DIALECT "_MASM") # if we are using the 64bit cl compiler, assume we also want the 64bit assembler -if(CMAKE_CL_64) +if(";${CMAKE_VS_PLATFORM_NAME};${MSVC_C_ARCHITECTURE_ID};${MSVC_CXX_ARCHITECTURE_ID};" + MATCHES ";(Win64|Itanium|x64|IA64);") set(CMAKE_ASM${ASM_DIALECT}_COMPILER_INIT ml64) else() set(CMAKE_ASM${ASM_DIALECT}_COMPILER_INIT ml) |