Merge topic 'FindOpenSSL-prefer-root'
e346c47a FindOpenSSL: Prefer OPENSSL_ROOT_DIR first (#14764)
This commit is contained in:
commit
6a1a644940
@ -74,9 +74,9 @@ set(_OPENSSL_ROOT_HINTS_AND_PATHS
|
|||||||
find_path(OPENSSL_INCLUDE_DIR
|
find_path(OPENSSL_INCLUDE_DIR
|
||||||
NAMES
|
NAMES
|
||||||
openssl/ssl.h
|
openssl/ssl.h
|
||||||
|
${_OPENSSL_ROOT_HINTS_AND_PATHS}
|
||||||
HINTS
|
HINTS
|
||||||
${_OPENSSL_INCLUDEDIR}
|
${_OPENSSL_INCLUDEDIR}
|
||||||
${_OPENSSL_ROOT_HINTS_AND_PATHS}
|
|
||||||
PATH_SUFFIXES
|
PATH_SUFFIXES
|
||||||
include
|
include
|
||||||
)
|
)
|
||||||
@ -189,9 +189,9 @@ if(WIN32 AND NOT CYGWIN)
|
|||||||
find_library(LIB_EAY
|
find_library(LIB_EAY
|
||||||
NAMES
|
NAMES
|
||||||
libeay32
|
libeay32
|
||||||
|
${_OPENSSL_ROOT_HINTS_AND_PATHS}
|
||||||
HINTS
|
HINTS
|
||||||
${_OPENSSL_LIBDIR}
|
${_OPENSSL_LIBDIR}
|
||||||
${_OPENSSL_ROOT_HINTS_AND_PATHS}
|
|
||||||
PATH_SUFFIXES
|
PATH_SUFFIXES
|
||||||
lib
|
lib
|
||||||
)
|
)
|
||||||
@ -199,9 +199,9 @@ if(WIN32 AND NOT CYGWIN)
|
|||||||
find_library(SSL_EAY
|
find_library(SSL_EAY
|
||||||
NAMES
|
NAMES
|
||||||
ssleay32
|
ssleay32
|
||||||
|
${_OPENSSL_ROOT_HINTS_AND_PATHS}
|
||||||
HINTS
|
HINTS
|
||||||
${_OPENSSL_LIBDIR}
|
${_OPENSSL_LIBDIR}
|
||||||
${_OPENSSL_ROOT_HINTS_AND_PATHS}
|
|
||||||
PATH_SUFFIXES
|
PATH_SUFFIXES
|
||||||
lib
|
lib
|
||||||
)
|
)
|
||||||
@ -216,9 +216,9 @@ else()
|
|||||||
ssl
|
ssl
|
||||||
ssleay32
|
ssleay32
|
||||||
ssleay32MD
|
ssleay32MD
|
||||||
|
${_OPENSSL_ROOT_HINTS_AND_PATHS}
|
||||||
HINTS
|
HINTS
|
||||||
${_OPENSSL_LIBDIR}
|
${_OPENSSL_LIBDIR}
|
||||||
${_OPENSSL_ROOT_HINTS_AND_PATHS}
|
|
||||||
PATH_SUFFIXES
|
PATH_SUFFIXES
|
||||||
lib
|
lib
|
||||||
)
|
)
|
||||||
@ -226,9 +226,9 @@ else()
|
|||||||
find_library(OPENSSL_CRYPTO_LIBRARY
|
find_library(OPENSSL_CRYPTO_LIBRARY
|
||||||
NAMES
|
NAMES
|
||||||
crypto
|
crypto
|
||||||
|
${_OPENSSL_ROOT_HINTS_AND_PATHS}
|
||||||
HINTS
|
HINTS
|
||||||
${_OPENSSL_LIBDIR}
|
${_OPENSSL_LIBDIR}
|
||||||
${_OPENSSL_ROOT_HINTS_AND_PATHS}
|
|
||||||
PATH_SUFFIXES
|
PATH_SUFFIXES
|
||||||
lib
|
lib
|
||||||
)
|
)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user