diff options
| author | Brent Cook <busterb@gmail.com> | 2019-01-21 15:26:32 -0600 |
|---|---|---|
| committer | Brent Cook <busterb@gmail.com> | 2019-01-21 15:26:32 -0600 |
| commit | 1b2e3576e0f72087a25b1a6234805d9bd3c8af17 (patch) | |
| tree | 30b61e94b644832f69c54fae566ef8e6f0b058df | |
| parent | 6c6b58f610a27516bf9ab0541be29d698be85678 (diff) | |
| download | portable-1b2e3576e0f72087a25b1a6234805d9bd3c8af17.tar.gz portable-1b2e3576e0f72087a25b1a6234805d9bd3c8af17.tar.bz2 portable-1b2e3576e0f72087a25b1a6234805d9bd3c8af17.zip | |
a couple of fixes to get MSVC Win64 going again
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | crypto/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b29998d..3c79743 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -273,7 +273,7 @@ if(ENABLE_ASM) | |||
| 273 | endif() | 273 | endif() |
| 274 | elseif(APPLE AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64") | 274 | elseif(APPLE AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64") |
| 275 | set(HOST_ASM_MACOSX_X86_64 true) | 275 | set(HOST_ASM_MACOSX_X86_64 true) |
| 276 | elseif(MSVC AND AND "${CMAKE_GENERATOR}" MATCHES "Win64") | 276 | elseif(MSVC AND "${CMAKE_GENERATOR}" MATCHES "Win64") |
| 277 | set(HOST_ASM_MASM_X86_64 true) | 277 | set(HOST_ASM_MASM_X86_64 true) |
| 278 | ENABLE_LANGUAGE(ASM_MASM) | 278 | ENABLE_LANGUAGE(ASM_MASM) |
| 279 | elseif(CMAKE_SYSTEM_NAME MATCHES "MINGW" AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64") | 279 | elseif(CMAKE_SYSTEM_NAME MATCHES "MINGW" AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64") |
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index 8305b82..796f835 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt | |||
| @@ -147,7 +147,7 @@ if(HOST_ASM_MASM_X86_64) | |||
| 147 | add_definitions(-DWHIRLPOOL_ASM) | 147 | add_definitions(-DWHIRLPOOL_ASM) |
| 148 | add_definitions(-DOPENSSL_CPUID_OBJ) | 148 | add_definitions(-DOPENSSL_CPUID_OBJ) |
| 149 | set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MASM_SRC}) | 149 | set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MASM_SRC}) |
| 150 | set_source_files_properties(${ASM_X86_64_MASM_SRC} PROPERTIES COMPILE_FLAGS "-x assembler-with-cpp") | 150 | set_property(SOURCE ${ASM_X86_64_MINGW64_SRC} PROPERTY LANGUAGE C) |
| 151 | endif() | 151 | endif() |
| 152 | 152 | ||
| 153 | if(HOST_ASM_MINGW64_X86_64) | 153 | if(HOST_ASM_MINGW64_X86_64) |