diff options
| author | Brent Cook <bcook@openbsd.org> | 2016-04-09 12:08:26 -0500 |
|---|---|---|
| committer | Brent Cook <bcook@openbsd.org> | 2016-04-09 12:08:26 -0500 |
| commit | 752ad82d33bef07591ae323e17de2cb8f0e50e20 (patch) | |
| tree | dfbea04269c52cc6f31c6731edcc192d5da07616 /CMakeLists.txt | |
| parent | 2510a5e6f98360bb7cd4a52ecf2274656fe75dcc (diff) | |
| parent | e1f8a1e160be5cda14986e75a00b7d5f5ca87225 (diff) | |
| download | portable-752ad82d33bef07591ae323e17de2cb8f0e50e20.tar.gz portable-752ad82d33bef07591ae323e17de2cb8f0e50e20.tar.bz2 portable-752ad82d33bef07591ae323e17de2cb8f0e50e20.zip | |
Land #188, add ASM support for cmake builds
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c9ce99d..cecaafe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -46,7 +46,6 @@ endif() | |||
| 46 | 46 | ||
| 47 | add_definitions(-DLIBRESSL_INTERNAL) | 47 | add_definitions(-DLIBRESSL_INTERNAL) |
| 48 | add_definitions(-DOPENSSL_NO_HW_PADLOCK) | 48 | add_definitions(-DOPENSSL_NO_HW_PADLOCK) |
| 49 | add_definitions(-DOPENSSL_NO_ASM) | ||
| 50 | 49 | ||
| 51 | set(CMAKE_POSITION_INDEPENDENT_CODE true) | 50 | set(CMAKE_POSITION_INDEPENDENT_CODE true) |
| 52 | 51 | ||
| @@ -182,6 +181,14 @@ if(HAVE_ERR_H) | |||
| 182 | add_definitions(-DHAVE_ERR_H) | 181 | add_definitions(-DHAVE_ERR_H) |
| 183 | endif() | 182 | endif() |
| 184 | 183 | ||
| 184 | if("${CMAKE_C_COMPILER_ABI}" STREQUAL "ELF" AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64" AND ENABLE_ASM) | ||
| 185 | set(HOST_ASM_ELF_X86_64 true) | ||
| 186 | endif() | ||
| 187 | |||
| 188 | if(APPLE AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64" AND ENABLE_ASM) | ||
| 189 | set(HOST_ASM_MACOSX_X86_64 true) | ||
| 190 | endif() | ||
| 191 | |||
| 185 | set(OPENSSL_LIBS ssl crypto) | 192 | set(OPENSSL_LIBS ssl crypto) |
| 186 | if(CMAKE_HOST_WIN32) | 193 | if(CMAKE_HOST_WIN32) |
| 187 | set(OPENSSL_LIBS ${OPENSSL_LIBS} ws2_32) | 194 | set(OPENSSL_LIBS ${OPENSSL_LIBS} ws2_32) |