diff options
| author | Ho Cheung <hocheung20@gmail.com> | 2014-02-18 18:39:01 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-02-18 20:05:32 (GMT) |
| commit | e346c47ac55e6cb96c5747f1555fd7d4f8af9cbc (patch) | |
| tree | db4e238107d2c39d6d0e793cd02c9892b6203606 /Modules/FindOpenSSL.cmake | |
| parent | 586d2ce8a7eaa76b1048226fb1e26fe52071ee8b (diff) | |
| download | CMake-e346c47ac55e6cb96c5747f1555fd7d4f8af9cbc.zip CMake-e346c47ac55e6cb96c5747f1555fd7d4f8af9cbc.tar.gz CMake-e346c47ac55e6cb96c5747f1555fd7d4f8af9cbc.tar.bz2 | |
FindOpenSSL: Prefer OPENSSL_ROOT_DIR first (#14764)
Use hints computed from this explicit variable before those
computed by PkgConfig. They are more specific.
Diffstat (limited to 'Modules/FindOpenSSL.cmake')
| -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 ) |