Commit 6a1a6449 authored by Brad King's avatar Brad King 💬 Committed by Kitware Robot
Browse files

Merge topic 'FindOpenSSL-prefer-root'

e346c47a FindOpenSSL: Prefer OPENSSL_ROOT_DIR first (#14764)
parents 59df48aa e346c47a
...@@ -74,9 +74,9 @@ set(_OPENSSL_ROOT_HINTS_AND_PATHS ...@@ -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) ...@@ -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) ...@@ -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() ...@@ -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() ...@@ -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
) )
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment