kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Ho Cheung 2014-02-04 18:13:59 -06:00 committed by Brad King
parent fed3f88f8c
commit 12d6eb639d
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Modules/FindOpenSSL.cmake
View File

@ -59,10 +59,6 @@ if (WIN32)
"C:/OpenSSL-Win64/" "C:/OpenSSL-Win64/"
) )
unset(_programfiles) unset(_programfiles)
set(_OPENSSL_ROOT_HINTS_AND_PATHS
HINTS ${_OPENSSL_ROOT_HINTS}
PATHS ${_OPENSSL_ROOT_PATHS}
)
else () else ()
set(_OPENSSL_ROOT_HINTS set(_OPENSSL_ROOT_HINTS
${OPENSSL_ROOT_DIR} ${OPENSSL_ROOT_DIR}
@ -70,6 +66,11 @@ else ()
) )
endif () endif ()
set(_OPENSSL_ROOT_HINTS_AND_PATHS
HINTS ${_OPENSSL_ROOT_HINTS}
PATHS ${_OPENSSL_ROOT_PATHS}
)
find_path(OPENSSL_INCLUDE_DIR find_path(OPENSSL_INCLUDE_DIR
NAMES NAMES
openssl/ssl.h openssl/ssl.h