use generator to determine if we're building 64-bit code on Windows

chisa0a · Jan 21, 2019 · 6c6b58f · 6c6b58f
1 parent d649daf
commit 6c6b58f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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")