diff options
| author | Brad King <brad.king@kitware.com> | 2014-02-19 13:34:27 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-02-19 13:34:27 (GMT) |
| commit | 6a1a6449406f98bfc3fd5002bc84e4dfd401c704 (patch) | |
| tree | a76ec0c887a615bbbc77b10ee803c6f5177a4f73 | |
| parent | 59df48aaaaa2722b9847a3bf1855c6c6ff838366 (diff) | |
| parent | e346c47ac55e6cb96c5747f1555fd7d4f8af9cbc (diff) | |
| download | CMake-6a1a6449406f98bfc3fd5002bc84e4dfd401c704.zip CMake-6a1a6449406f98bfc3fd5002bc84e4dfd401c704.tar.gz CMake-6a1a6449406f98bfc3fd5002bc84e4dfd401c704.tar.bz2 | |
Merge topic 'FindOpenSSL-prefer-root'
e346c47a FindOpenSSL: Prefer OPENSSL_ROOT_DIR first (#14764)
| -rw-r--r-- | Modules/FindOpenSSL.cmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake index cb99f7a..340b417 100644 --- a/Modules/FindOpenSSL.cmake +++ b/Modules/FindOpenSSL.cmake @@ -74,9 +74,9 @@ set(_OPENSSL_ROOT_HINTS_AND_PATHS find_path(OPENSSL_INCLUDE_DIR NAMES openssl/ssl.h + ${_OPENSSL_ROOT_HINTS_AND_PATHS} HINTS ${_OPENSSL_INCLUDEDIR} - ${_OPENSSL_ROOT_HINTS_AND_PATHS} PATH_SUFFIXES include ) @@ -189,9 +189,9 @@ if(WIN32 AND NOT CYGWIN) find_library(LIB_EAY NAMES libeay32 + ${_OPENSSL_ROOT_HINTS_AND_PATHS} HINTS ${_OPENSSL_LIBDIR} - ${_OPENSSL_ROOT_HINTS_AND_PATHS} PATH_SUFFIXES lib ) @@ -199,9 +199,9 @@ if(WIN32 AND NOT CYGWIN) find_library(SSL_EAY NAMES ssleay32 + ${_OPENSSL_ROOT_HINTS_AND_PATHS} HINTS ${_OPENSSL_LIBDIR} - ${_OPENSSL_ROOT_HINTS_AND_PATHS} PATH_SUFFIXES lib ) @@ -216,9 +216,9 @@ else() ssl ssleay32 ssleay32MD + ${_OPENSSL_ROOT_HINTS_AND_PATHS} HINTS ${_OPENSSL_LIBDIR} - ${_OPENSSL_ROOT_HINTS_AND_PATHS} PATH_SUFFIXES lib ) @@ -226,9 +226,9 @@ else() find_library(OPENSSL_CRYPTO_LIBRARY NAMES crypto + ${_OPENSSL_ROOT_HINTS_AND_PATHS} HINTS ${_OPENSSL_LIBDIR} - ${_OPENSSL_ROOT_HINTS_AND_PATHS} PATH_SUFFIXES lib ) |