diff options
| author | Brent Cook <busterb@gmail.com> | 2019-01-21 11:19:11 -0600 |
|---|---|---|
| committer | Brent Cook <busterb@gmail.com> | 2019-01-21 11:19:11 -0600 |
| commit | 6c6b58f610a27516bf9ab0541be29d698be85678 (patch) | |
| tree | 941d3f8dd408465da1c087908deb0e5b756844cd | |
| parent | d649daf41d8425602ca82e03db923cd8790ae7f5 (diff) | |
| download | portable-6c6b58f610a27516bf9ab0541be29d698be85678.tar.gz portable-6c6b58f610a27516bf9ab0541be29d698be85678.tar.bz2 portable-6c6b58f610a27516bf9ab0541be29d698be85678.zip | |
use generator to determine if we're building 64-bit code on Windows
| -rw-r--r-- | CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1f02f16..b29998d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -273,7 +273,7 @@ if(ENABLE_ASM) | |||
| 273 | endif() | 273 | endif() |
| 274 | elseif(APPLE AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64") | 274 | elseif(APPLE AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64") |
| 275 | set(HOST_ASM_MACOSX_X86_64 true) | 275 | set(HOST_ASM_MACOSX_X86_64 true) |
| 276 | elseif(MSVC AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "AMD64") | 276 | elseif(MSVC AND AND "${CMAKE_GENERATOR}" MATCHES "Win64") |
| 277 | set(HOST_ASM_MASM_X86_64 true) | 277 | set(HOST_ASM_MASM_X86_64 true) |
| 278 | ENABLE_LANGUAGE(ASM_MASM) | 278 | ENABLE_LANGUAGE(ASM_MASM) |
| 279 | elseif(CMAKE_SYSTEM_NAME MATCHES "MINGW" AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64") | 279 | elseif(CMAKE_SYSTEM_NAME MATCHES "MINGW" AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64") |