Land #894, fix to enable ASM support in MinGW builds

This commit is contained in:
Brent Cook 2023-08-13 23:23:23 -05:00
commit ca8ea65259
2 changed files with 2 additions and 2 deletions

View File

@ -371,7 +371,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()

View File

@ -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()