diff options
| author | Ho Cheung <hocheung20@gmail.com> | 2014-02-05 00:13:59 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-02-05 17:28:36 (GMT) |
| commit | 12d6eb639d3fc7dd9b9a1280d462a47c5f123120 (patch) | |
| tree | 878049f45775d613cbc104a17860dd8be96a3940 | |
| parent | fed3f88f8c5bf2ec5de0b8e406ef5c1e39781833 (diff) | |
| download | CMake-12d6eb639d3fc7dd9b9a1280d462a47c5f123120.zip CMake-12d6eb639d3fc7dd9b9a1280d462a47c5f123120.tar.gz CMake-12d6eb639d3fc7dd9b9a1280d462a47c5f123120.tar.bz2 | |
FindOpenSSL: Honor OPENSSL_ROOT_DIR everywhere (#14735)
In commit v2.8.5~176^2~2 (FindOpenSSL: We should only use hints to find
OpenSSL, 2011-03-28) values for HINTS and PATHS of find_* calls were
computed everywhere but only used on Windows. Use them everywhere.
| -rw-r--r-- | Modules/FindOpenSSL.cmake | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake index 6bf2aad..cb99f7a 100644 --- a/Modules/FindOpenSSL.cmake +++ b/Modules/FindOpenSSL.cmake @@ -59,10 +59,6 @@ if (WIN32) "C:/OpenSSL-Win64/" ) unset(_programfiles) - set(_OPENSSL_ROOT_HINTS_AND_PATHS - HINTS ${_OPENSSL_ROOT_HINTS} - PATHS ${_OPENSSL_ROOT_PATHS} - ) else () set(_OPENSSL_ROOT_HINTS ${OPENSSL_ROOT_DIR} @@ -70,6 +66,11 @@ else () ) endif () +set(_OPENSSL_ROOT_HINTS_AND_PATHS + HINTS ${_OPENSSL_ROOT_HINTS} + PATHS ${_OPENSSL_ROOT_PATHS} + ) + find_path(OPENSSL_INCLUDE_DIR NAMES openssl/ssl.h |