Land #588, enable masm with VS2019 targets

2 files changed, 3 insertions, 2 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)
                 endif()
         elseif(APPLE AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
                 set(HOST_ASM_MACOSX_X86_64 true)
-        elseif(MSVC AND "${CMAKE_GENERATOR}" MATCHES "Win64")
+        elseif(MSVC AND ("${CMAKE_GENERATOR}" MATCHES "Win64" OR "${CMAKE_GENERATOR_PLATFORM}" STREQUAL "x64"))
                 set(HOST_ASM_MASM_X86_64 true)
                 ENABLE_LANGUAGE(ASM_MASM)
         elseif(CMAKE_SYSTEM_NAME MATCHES "MINGW" AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index 01effbf..7867249 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -936,7 +936,8 @@ if(NOT ENABLE_ASM)
         add_definitions(-DOPENSSL_NO_ASM)
 else()
         if(MSVC)
-                if(NOT "${CMAKE_GENERATOR}" MATCHES "Win64")
+                if((NOT "${CMAKE_GENERATOR}" MATCHES "Win64") AND
+                   (NOT "${CMAKE_GENERATOR_PLATFORM}" STREQUAL "x64"))
                         add_definitions(-DOPENSSL_NO_ASM)
                 endif()
         elseif(WIN32)