From 5c63ba97612e1430d049be0bb7b179db24936a28 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 6 Aug 2023 18:13:51 +0000 Subject: cmake: fix to use MINGW variable to detect MinGW --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c5b880b..690cd48 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -362,7 +362,7 @@ if(ENABLE_ASM) 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") + elseif(MINGW AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64") set(HOST_ASM_MINGW64_X86_64 true) endif() endif() -- cgit v1.2.3-55-g6feb From e0fd031f300570437f1aa768ea6997850a36cd0a Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 6 Aug 2023 18:14:25 +0000 Subject: cmake: fix to not force-disable ASM for MinGW builds --- crypto/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index b425959..1e73e88 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt @@ -904,7 +904,7 @@ else() (NOT "${CMAKE_GENERATOR_PLATFORM}" STREQUAL "x64")) add_definitions(-DOPENSSL_NO_ASM) endif() - elseif(WIN32) + elseif(WIN32 AND NOT MINGW) add_definitions(-DOPENSSL_NO_ASM) endif() endif() -- cgit v1.2.3-55-g6feb