From bbb662b69c48c07d93e642548c0f71ebbdc06d93 Mon Sep 17 00:00:00 2001 From: kinichiro Date: Sun, 19 May 2019 13:20:06 +0900 Subject: Fix masm build - Fix masm operators and comments - Add -DOPENSSL_NO_ASM only if not 64 bit build - Add -DCMAKE_INSTALL_PREFIX to avoid build error --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index af287a4..a0b0599 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -289,7 +289,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}" MATCHES "AMD64") + elseif(MSVC AND "${CMAKE_GENERATOR}" MATCHES "Win64") # XXX Disabled for now, CMake's MASM support seems to either never # build supply ASM or build it with the C compiler in a mode where it # does not parse correctly. It might be easier to get NASM support working. -- cgit v1.2.3-55-g6feb