diff options
| author | Brad King <brad.king@kitware.com> | 2014-02-06 16:10:25 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-02-06 16:10:25 (GMT) |
| commit | f55528186a9ff607cbf369299253957848314dd5 (patch) | |
| tree | 00922ac881c6a3814e42fca1c962011548c8561e | |
| parent | 0795aed6380dfbacec2b46c2031c3802be3bdc7c (diff) | |
| parent | 12d6eb639d3fc7dd9b9a1280d462a47c5f123120 (diff) | |
| download | CMake-f55528186a9ff607cbf369299253957848314dd5.zip CMake-f55528186a9ff607cbf369299253957848314dd5.tar.gz CMake-f55528186a9ff607cbf369299253957848314dd5.tar.bz2 | |
Merge topic 'FindOpenSSL-root-dir'
12d6eb63 FindOpenSSL: Honor OPENSSL_ROOT_DIR everywhere (#14735)
| -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 |