Merge topic 'fix-openssl-win'
4a4c0ee
FindOpenSSL: also find the non-MD debug libraries for MSVC894b775
FindOpenSSL: fix library selection on Windows (#13645)
This commit is contained in:
commit
163802e8a1
|
@ -87,6 +87,7 @@ if(WIN32 AND NOT CYGWIN)
|
|||
find_library(LIB_EAY_DEBUG
|
||||
NAMES
|
||||
libeay32MDd
|
||||
libeay32d
|
||||
${_OPENSSL_ROOT_HINTS_AND_PATHS}
|
||||
PATH_SUFFIXES
|
||||
"lib"
|
||||
|
@ -108,6 +109,7 @@ if(WIN32 AND NOT CYGWIN)
|
|||
find_library(SSL_EAY_DEBUG
|
||||
NAMES
|
||||
ssleay32MDd
|
||||
ssleay32d
|
||||
${_OPENSSL_ROOT_HINTS_AND_PATHS}
|
||||
PATH_SUFFIXES
|
||||
"lib"
|
||||
|
@ -127,6 +129,11 @@ if(WIN32 AND NOT CYGWIN)
|
|||
"lib/VC"
|
||||
)
|
||||
|
||||
set(LIB_EAY_LIBRARY_DEBUG "${LIB_EAY_DEBUG}")
|
||||
set(LIB_EAY_LIBRARY_RELEASE "${LIB_EAY_RELEASE}")
|
||||
set(SSL_EAY_LIBRARY_DEBUG "${SSL_EAY_DEBUG}")
|
||||
set(SSL_EAY_LIBRARY_RELEASE "${SSL_EAY_RELEASE}")
|
||||
|
||||
include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
|
||||
select_library_configurations(LIB_EAY)
|
||||
select_library_configurations(SSL_EAY)
|
||||
|
|
Loading…
Reference in New Issue