cmake: Fix finding OpenSSL 1.1.0 libs on Windows platforms

This commit is contained in:
Martin Fleisz 2018-04-11 10:18:46 +02:00
parent 7f6103e1af
commit dfd269e207

View File

@ -107,6 +107,7 @@ ELSEIF(WIN32 AND NOT CYGWIN)
NAMES NAMES
"libeay32${MSVC_RUNTIME_SUFFIX}d" "libeay32${MSVC_RUNTIME_SUFFIX}d"
libeay32 libeay32
libcrypto
${_OPENSSL_ROOT_HINTS_AND_PATHS} ${_OPENSSL_ROOT_HINTS_AND_PATHS}
PATH_SUFFIXES PATH_SUFFIXES
${MSVC_RUNTIME_PATH_SUFFIX} ${MSVC_RUNTIME_PATH_SUFFIX}
@ -119,6 +120,7 @@ ELSEIF(WIN32 AND NOT CYGWIN)
NAMES NAMES
"libeay32${MSVC_RUNTIME_SUFFIX}" "libeay32${MSVC_RUNTIME_SUFFIX}"
libeay32 libeay32
libcrypto
${_OPENSSL_ROOT_HINTS_AND_PATHS} ${_OPENSSL_ROOT_HINTS_AND_PATHS}
PATH_SUFFIXES PATH_SUFFIXES
${MSVC_RUNTIME_PATH_SUFFIX} ${MSVC_RUNTIME_PATH_SUFFIX}
@ -132,6 +134,7 @@ ELSEIF(WIN32 AND NOT CYGWIN)
"ssleay32${MSVC_RUNTIME_SUFFIX}d" "ssleay32${MSVC_RUNTIME_SUFFIX}d"
ssleay32 ssleay32
ssl ssl
libssl
${_OPENSSL_ROOT_HINTS_AND_PATHS} ${_OPENSSL_ROOT_HINTS_AND_PATHS}
PATH_SUFFIXES PATH_SUFFIXES
${MSVC_RUNTIME_PATH_SUFFIX} ${MSVC_RUNTIME_PATH_SUFFIX}
@ -145,6 +148,7 @@ ELSEIF(WIN32 AND NOT CYGWIN)
"ssleay32${MSVC_RUNTIME_SUFFIX}" "ssleay32${MSVC_RUNTIME_SUFFIX}"
ssleay32 ssleay32
ssl ssl
libssl
${_OPENSSL_ROOT_HINTS_AND_PATHS} ${_OPENSSL_ROOT_HINTS_AND_PATHS}
PATH_SUFFIXES PATH_SUFFIXES
${MSVC_RUNTIME_PATH_SUFFIX} ${MSVC_RUNTIME_PATH_SUFFIX}
@ -164,6 +168,7 @@ ELSEIF(WIN32 AND NOT CYGWIN)
FIND_LIBRARY(LIB_EAY FIND_LIBRARY(LIB_EAY
NAMES NAMES
libeay32 libeay32
libcrypto
${_OPENSSL_ROOT_HINTS_AND_PATHS} ${_OPENSSL_ROOT_HINTS_AND_PATHS}
PATH_SUFFIXES PATH_SUFFIXES
"lib" "lib"
@ -173,6 +178,7 @@ ELSEIF(WIN32 AND NOT CYGWIN)
FIND_LIBRARY(SSL_EAY FIND_LIBRARY(SSL_EAY
NAMES NAMES
ssleay32 ssleay32
libssl
${_OPENSSL_ROOT_HINTS_AND_PATHS} ${_OPENSSL_ROOT_HINTS_AND_PATHS}
PATH_SUFFIXES PATH_SUFFIXES
"lib" "lib"
@ -186,6 +192,7 @@ ELSEIF(WIN32 AND NOT CYGWIN)
FIND_LIBRARY(LIB_EAY FIND_LIBRARY(LIB_EAY
NAMES NAMES
libeay32 libeay32
libcrypto
HINTS HINTS
${_OPENSSL_LIBDIR} ${_OPENSSL_LIBDIR}
${_OPENSSL_ROOT_HINTS_AND_PATHS} ${_OPENSSL_ROOT_HINTS_AND_PATHS}
@ -196,6 +203,7 @@ ELSEIF(WIN32 AND NOT CYGWIN)
FIND_LIBRARY(SSL_EAY FIND_LIBRARY(SSL_EAY
NAMES NAMES
ssleay32 ssleay32
libssl
HINTS HINTS
${_OPENSSL_LIBDIR} ${_OPENSSL_LIBDIR}
${_OPENSSL_ROOT_HINTS_AND_PATHS} ${_OPENSSL_ROOT_HINTS_AND_PATHS}