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 --- crypto/CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'crypto') diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index e1b9287..4c902ad 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt @@ -920,7 +920,11 @@ endif() if(NOT ENABLE_ASM) add_definitions(-DOPENSSL_NO_ASM) else() - if(WIN32) + if(MSVC) + if(NOT "${CMAKE_GENERATOR}" MATCHES "Win64") + add_definitions(-DOPENSSL_NO_ASM) + endif() + elseif(WIN32) add_definitions(-DOPENSSL_NO_ASM) endif() endif() -- cgit v1.2.3-55-g6feb