diff options
| author | Shauren <shauren.trinity@gmail.com> | 2018-03-06 21:06:34 +0100 |
|---|---|---|
| committer | vincent-michael <vincent_michael@gmx.de> | 2018-03-20 17:55:22 +0100 |
| commit | 1dd44207bd4a50b1ad159d77dd940f876276d74b (patch) | |
| tree | eee2fbd2f0a2af4009aba77aae8acd142359173b /cmake/macros | |
| parent | 3670779e8eb07c05f77e61e09486d85d7210e4ed (diff) | |
Buildsystem: Fixed finding openssl 1.1 libs
(cherry picked from commit 413cf257cd8d0fc306fea0dcfa1a630d73b539c8)
Diffstat (limited to 'cmake/macros')
| -rw-r--r-- | cmake/macros/FindOpenSSL.cmake | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/cmake/macros/FindOpenSSL.cmake b/cmake/macros/FindOpenSSL.cmake index d970ef02f65..2a691ee016c 100644 --- a/cmake/macros/FindOpenSSL.cmake +++ b/cmake/macros/FindOpenSSL.cmake @@ -80,30 +80,37 @@ IF(WIN32 AND NOT CYGWIN) # libeay32MD.lib is identical to ../libeay32.lib, and # ssleay32MD.lib is identical to ../ssleay32.lib + # Since OpenSSL 1.1, lib names are like libcrypto32MTd.lib and libssl32MTd.lib + if( "${CMAKE_SIZEOF_VOID_P}" STREQUAL "8" ) + set(_OPENSSL_MSVC_ARCH_SUFFIX "64") + else() + set(_OPENSSL_MSVC_ARCH_SUFFIX "32") + endif() + FIND_LIBRARY(LIB_EAY_DEBUG NAMES - libeay32MDd libeay32 + libcrypto${_OPENSSL_MSVC_ARCH_SUFFIX}MDd libeay32MDd libeay32 PATHS ${OPENSSL_ROOT_DIR}/lib/VC ) FIND_LIBRARY(LIB_EAY_RELEASE NAMES - libeay32MD libeay32 + libcrypto${_OPENSSL_MSVC_ARCH_SUFFIX}MD libeay32MD libeay32 PATHS ${OPENSSL_ROOT_DIR}/lib/VC ) FIND_LIBRARY(SSL_EAY_DEBUG NAMES - ssleay32MDd ssleay32 ssl + libssl${_OPENSSL_MSVC_ARCH_SUFFIX}MDd ssleay32MDd ssleay32 ssl PATHS ${OPENSSL_ROOT_DIR}/lib/VC ) FIND_LIBRARY(SSL_EAY_RELEASE NAMES - ssleay32MD ssleay32 ssl + libssl${_OPENSSL_MSVC_ARCH_SUFFIX}MD ssleay32MD ssleay32 ssl PATHS ${OPENSSL_ROOT_DIR}/lib/VC ) |