kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'FindOpenSSL-new-windows-names' 

ed1758f8 FindOpenSSL: Fix detection of OpenSSL 1.1 Win32/64
This commit is contained in:
Brad King 2016-08-31 09:19:44 -04:00 committed by CMake Topic Stage
parent 7a25220776 ed1758f8eb
commit a9affa07cd
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Modules/FindOpenSSL.cmake
View File

@ -133,6 +133,13 @@ if(WIN32 AND NOT CYGWIN)
set(_OPENSSL_MSVC_RT_MODE "MD") set(_OPENSSL_MSVC_RT_MODE "MD")
endif () endif ()
# 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()
if(OPENSSL_USE_STATIC_LIBS) if(OPENSSL_USE_STATIC_LIBS)
set(_OPENSSL_PATH_SUFFIXES set(_OPENSSL_PATH_SUFFIXES
"lib" "lib"
@ -149,6 +156,8 @@ if(WIN32 AND NOT CYGWIN)
find_library(LIB_EAY_DEBUG find_library(LIB_EAY_DEBUG
NAMES NAMES
libcrypto${_OPENSSL_MSVC_ARCH_SUFFIX}${_OPENSSL_MSVC_RT_MODE}d
libcryptod
libeay32${_OPENSSL_MSVC_RT_MODE}d libeay32${_OPENSSL_MSVC_RT_MODE}d
libeay32d libeay32d
NAMES_PER_DIR NAMES_PER_DIR
@ -159,6 +168,8 @@ if(WIN32 AND NOT CYGWIN)
find_library(LIB_EAY_RELEASE find_library(LIB_EAY_RELEASE
NAMES NAMES
libcrypto${_OPENSSL_MSVC_ARCH_SUFFIX}${_OPENSSL_MSVC_RT_MODE}
libcrypto
libeay32${_OPENSSL_MSVC_RT_MODE} libeay32${_OPENSSL_MSVC_RT_MODE}
libeay32 libeay32
NAMES_PER_DIR NAMES_PER_DIR
@ -169,6 +180,8 @@ if(WIN32 AND NOT CYGWIN)
find_library(SSL_EAY_DEBUG find_library(SSL_EAY_DEBUG
NAMES NAMES
libssl${_OPENSSL_MSVC_ARCH_SUFFIX}${_OPENSSL_MSVC_RT_MODE}d
libssld
ssleay32${_OPENSSL_MSVC_RT_MODE}d ssleay32${_OPENSSL_MSVC_RT_MODE}d
ssleay32d ssleay32d
NAMES_PER_DIR NAMES_PER_DIR
@ -179,6 +192,8 @@ if(WIN32 AND NOT CYGWIN)
find_library(SSL_EAY_RELEASE find_library(SSL_EAY_RELEASE
NAMES NAMES
libssl${_OPENSSL_MSVC_ARCH_SUFFIX}${_OPENSSL_MSVC_RT_MODE}
libssl
ssleay32${_OPENSSL_MSVC_RT_MODE} ssleay32${_OPENSSL_MSVC_RT_MODE}
ssleay32 ssleay32
ssl ssl
@ -236,6 +251,7 @@ if(WIN32 AND NOT CYGWIN)
# Not sure what to pick for -say- intel, let's use the toplevel ones and hope someone report issues: # Not sure what to pick for -say- intel, let's use the toplevel ones and hope someone report issues:
find_library(LIB_EAY find_library(LIB_EAY
NAMES NAMES
libcrypto
libeay32 libeay32
NAMES_PER_DIR NAMES_PER_DIR
${_OPENSSL_ROOT_HINTS_AND_PATHS} ${_OPENSSL_ROOT_HINTS_AND_PATHS}
@ -247,6 +263,7 @@ if(WIN32 AND NOT CYGWIN)
find_library(SSL_EAY find_library(SSL_EAY
NAMES NAMES
libssl
ssleay32 ssleay32
NAMES_PER_DIR NAMES_PER_DIR
${_OPENSSL_ROOT_HINTS_AND_PATHS} ${_OPENSSL_ROOT_HINTS_AND_PATHS}