factotum/libressl-portable
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix cmake build to enable masm with VS2019

Browse Source 
To specify architecture Visual Studio 16 2019 requires -A option,
and it is stored in variable CMAKE_GENERATOR_PLATFORM.
Until Visual Studio 15 2017, architecture was indicated as part of
generator string (e.g. "Visual Studio 15 2017 Win64")
This commit is contained in:
kinichiro 2020-05-09 18:46:13 +09:00
parent 0e8011de3c
commit 740488d89e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -299,7 +299,7 @@ if(ENABLE_ASM)
endif() endif()
elseif(APPLE AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64") elseif(APPLE AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
set(HOST_ASM_MACOSX_X86_64 true) set(HOST_ASM_MACOSX_X86_64 true)
elseif(MSVC AND "${CMAKE_GENERATOR}" MATCHES "Win64") elseif(MSVC AND ("${CMAKE_GENERATOR}" MATCHES "Win64" OR "${CMAKE_GENERATOR_PLATFORM}" STREQUAL "x64"))
set(HOST_ASM_MASM_X86_64 true) set(HOST_ASM_MASM_X86_64 true)
ENABLE_LANGUAGE(ASM_MASM) ENABLE_LANGUAGE(ASM_MASM)
elseif(CMAKE_SYSTEM_NAME MATCHES "MINGW" AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64") elseif(CMAKE_SYSTEM_NAME MATCHES "MINGW" AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")

3
crypto/CMakeLists.txt
View File

@ -936,7 +936,8 @@ if(NOT ENABLE_ASM)
add_definitions(-DOPENSSL_NO_ASM) add_definitions(-DOPENSSL_NO_ASM)
else() else()
if(MSVC) if(MSVC)
if(NOT "${CMAKE_GENERATOR}" MATCHES "Win64") if((NOT "${CMAKE_GENERATOR}" MATCHES "Win64") AND
(NOT "${CMAKE_GENERATOR_PLATFORM}" STREQUAL "x64"))
add_definitions(-DOPENSSL_NO_ASM) add_definitions(-DOPENSSL_NO_ASM)
endif() endif()
elseif(WIN32) elseif(WIN32)