From 12d6eb639d3fc7dd9b9a1280d462a47c5f123120 Mon Sep 17 00:00:00 2001 From: Ho Cheung Date: Tue, 4 Feb 2014 18:13:59 -0600 Subject: 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. --- Modules/FindOpenSSL.cmake | 9 +++++---- 1 file 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 -- cgit v0.12