From 1b2e3576e0f72087a25b1a6234805d9bd3c8af17 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Mon, 21 Jan 2019 15:26:32 -0600 Subject: a couple of fixes to get MSVC Win64 going again --- CMakeLists.txt | 2 +- crypto/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b29998d..3c79743 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 AND "${CMAKE_GENERATOR}" MATCHES "Win64") + elseif(MSVC 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") diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index 8305b82..796f835 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_source_files_properties(${ASM_X86_64_MASM_SRC} PROPERTIES COMPILE_FLAGS "-x assembler-with-cpp") + set_property(SOURCE ${ASM_X86_64_MINGW64_SRC} PROPERTY LANGUAGE C) endif() if(HOST_ASM_MINGW64_X86_64) -- cgit v1.2.3-55-g6feb