From e346c47ac55e6cb96c5747f1555fd7d4f8af9cbc Mon Sep 17 00:00:00 2001 From: Ho Cheung Date: Tue, 18 Feb 2014 12:39:01 -0600 Subject: [PATCH] FindOpenSSL: Prefer OPENSSL_ROOT_DIR first (#14764) Use hints computed from this explicit variable before those computed by PkgConfig. They are more specific. --- Modules/FindOpenSSL.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake index cb99f7a0f..340b41740 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 )