diff options
| author | kinichiro <kinichiro.inoguchi@gmail.com> | 2020-05-09 18:46:13 +0900 |
|---|---|---|
| committer | kinichiro <kinichiro.inoguchi@gmail.com> | 2020-05-09 20:24:27 +0900 |
| commit | 740488d89e69d026b8db0bf75b8bfe02ee464a3d (patch) | |
| tree | 36f6f280fa6e51bb1c1512192da1690ca5fb4f19 /crypto | |
| parent | 0e8011de3c2e4137019d4089bf20fb7192e1078c (diff) | |
| download | portable-740488d89e69d026b8db0bf75b8bfe02ee464a3d.tar.gz portable-740488d89e69d026b8db0bf75b8bfe02ee464a3d.tar.bz2 portable-740488d89e69d026b8db0bf75b8bfe02ee464a3d.zip | |
Fix cmake build to enable masm with VS2019
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")
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index 01effbf..7867249 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt | |||
| @@ -936,7 +936,8 @@ if(NOT ENABLE_ASM) | |||
| 936 | add_definitions(-DOPENSSL_NO_ASM) | 936 | add_definitions(-DOPENSSL_NO_ASM) |
| 937 | else() | 937 | else() |
| 938 | if(MSVC) | 938 | if(MSVC) |
| 939 | if(NOT "${CMAKE_GENERATOR}" MATCHES "Win64") | 939 | if((NOT "${CMAKE_GENERATOR}" MATCHES "Win64") AND |
| 940 | (NOT "${CMAKE_GENERATOR_PLATFORM}" STREQUAL "x64")) | ||
| 940 | add_definitions(-DOPENSSL_NO_ASM) | 941 | add_definitions(-DOPENSSL_NO_ASM) |
| 941 | endif() | 942 | endif() |
| 942 | elseif(WIN32) | 943 | elseif(WIN32) |