2 files changed, 3 insertions, 2 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1895161..1f02f16 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -273,8 +273,9 @@ 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 "x86_64")
+        elseif(MSVC AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "AMD64")
                 set(HOST_ASM_MASM_X86_64 true)
+                ENABLE_LANGUAGE(ASM_MASM)
         elseif(CMAKE_SYSTEM_NAME MATCHES "MINGW" AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
                 set(HOST_ASM_MINGW64_X86_64 true)
         endif()
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index a81d329..8305b82 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -147,7 +147,7 @@ if(HOST_ASM_MASM_X86_64)
         add_definitions(-DWHIRLPOOL_ASM)
         add_definitions(-DOPENSSL_CPUID_OBJ)
         set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MASM_SRC})
-        set_property(SOURCE ${ASM_X86_64_MASM_SRC} PROPERTY LANGUAGE C)
+        set_source_files_properties(${ASM_X86_64_MASM_SRC} PROPERTIES COMPILE_FLAGS "-x assembler-with-cpp")
 endif()
 
 if(HOST_ASM_MINGW64_X86_64)