From 6c6b58f610a27516bf9ab0541be29d698be85678 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Mon, 21 Jan 2019 11:19:11 -0600 Subject: [PATCH] use generator to determine if we're building 64-bit code on Windows --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) endif() elseif(APPLE AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64") set(HOST_ASM_MACOSX_X86_64 true) - elseif(MSVC AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "AMD64") + elseif(MSVC AND AND "${CMAKE_GENERATOR}" MATCHES "Win64") set(HOST_ASM_MASM_X86_64 true) ENABLE_LANGUAGE(ASM_MASM) elseif(CMAKE_SYSTEM_NAME MATCHES "MINGW" AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")