diff options
| author | Brent Cook <busterb@gmail.com> | 2020-05-11 06:47:01 -0500 |
|---|---|---|
| committer | Brent Cook <busterb@gmail.com> | 2020-05-11 06:47:01 -0500 |
| commit | adb8d019fe6b9aef20272376c184be0391e1f1b4 (patch) | |
| tree | dc3a0f34ba93d580deb29d3ff7ea50a705cd22c7 /CMakeLists.txt | |
| parent | 6344d903d8d519f032e5da4ffaab00489341ac1e (diff) | |
| parent | 740488d89e69d026b8db0bf75b8bfe02ee464a3d (diff) | |
| download | portable-adb8d019fe6b9aef20272376c184be0391e1f1b4.tar.gz portable-adb8d019fe6b9aef20272376c184be0391e1f1b4.tar.bz2 portable-adb8d019fe6b9aef20272376c184be0391e1f1b4.zip | |
Land #588, enable masm with VS2019 targets
Diffstat (limited to '')
| -rw-r--r-- | CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 515b3fc..a56f2e6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -299,7 +299,7 @@ if(ENABLE_ASM) | |||
| 299 | endif() | 299 | endif() |
| 300 | elseif(APPLE AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64") | 300 | elseif(APPLE AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64") |
| 301 | set(HOST_ASM_MACOSX_X86_64 true) | 301 | set(HOST_ASM_MACOSX_X86_64 true) |
| 302 | elseif(MSVC AND "${CMAKE_GENERATOR}" MATCHES "Win64") | 302 | elseif(MSVC AND ("${CMAKE_GENERATOR}" MATCHES "Win64" OR "${CMAKE_GENERATOR_PLATFORM}" STREQUAL "x64")) |
| 303 | set(HOST_ASM_MASM_X86_64 true) | 303 | set(HOST_ASM_MASM_X86_64 true) |
| 304 | ENABLE_LANGUAGE(ASM_MASM) | 304 | ENABLE_LANGUAGE(ASM_MASM) |
| 305 | elseif(CMAKE_SYSTEM_NAME MATCHES "MINGW" AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64") | 305 | elseif(CMAKE_SYSTEM_NAME MATCHES "MINGW" AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64") |