From 0d8c5ba42a075184f4383c62bd91e67fd5c4ccf0 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 22 Sep 2016 07:55:27 -0400 Subject: FindOpenSSL: Search in more-specific directories before less-specific Since commit v3.6.0-rc1~182^2 (FindOpenSSL: Prefer libs early in search path regardless of name, 2016-04-04) we use the `NAMES_PER_DIR` option to `find_library` calls to consider all names in each directory before moving on to the next directory. Fix our library search directory ordering to place more-specific (e.g. VC/) directories before the general directories. Otherwise they may never be considered. Closes: #16320 --- Modules/FindOpenSSL.cmake | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake index 7ddd783..034b0e6 100644 --- a/Modules/FindOpenSSL.cmake +++ b/Modules/FindOpenSSL.cmake @@ -142,15 +142,15 @@ if(WIN32 AND NOT CYGWIN) if(OPENSSL_USE_STATIC_LIBS) set(_OPENSSL_PATH_SUFFIXES - "lib" - "VC/static" "lib/VC/static" + "VC/static" + "lib" ) else() set(_OPENSSL_PATH_SUFFIXES - "lib" - "VC" "lib/VC" + "VC" + "lib" ) endif () @@ -227,8 +227,8 @@ if(WIN32 AND NOT CYGWIN) NAMES_PER_DIR ${_OPENSSL_ROOT_HINTS_AND_PATHS} PATH_SUFFIXES - "lib" "lib/MinGW" + "lib" ) find_library(SSL_EAY @@ -237,8 +237,8 @@ if(WIN32 AND NOT CYGWIN) NAMES_PER_DIR ${_OPENSSL_ROOT_HINTS_AND_PATHS} PATH_SUFFIXES - "lib" "lib/MinGW" + "lib" ) mark_as_advanced(SSL_EAY LIB_EAY) -- cgit v0.12