diff options
| author | Brent Cook <busterb@gmail.com> | 2020-05-11 06:47:01 -0500 |
|---|---|---|
| committer | Brent Cook <busterb@gmail.com> | 2020-05-11 06:47:01 -0500 |
| commit | adb8d019fe6b9aef20272376c184be0391e1f1b4 (patch) | |
| tree | dc3a0f34ba93d580deb29d3ff7ea50a705cd22c7 /crypto | |
| parent | 6344d903d8d519f032e5da4ffaab00489341ac1e (diff) | |
| parent | 740488d89e69d026b8db0bf75b8bfe02ee464a3d (diff) | |
| download | portable-adb8d019fe6b9aef20272376c184be0391e1f1b4.tar.gz portable-adb8d019fe6b9aef20272376c184be0391e1f1b4.tar.bz2 portable-adb8d019fe6b9aef20272376c184be0391e1f1b4.zip | |
Land #588, enable masm with VS2019 targets
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) |