diff options
| author | Brad King <brad.king@kitware.com> | 2016-09-23 12:40:00 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-09-23 12:40:00 (GMT) |
| commit | 0314f26412d3944f7ead47656e9347440141e815 (patch) | |
| tree | 75afd0c1f751ac0c809efbfdf0ae1f64f18588ed | |
| parent | 785f875426ec7aebb6583419515bf4e4c3975464 (diff) | |
| parent | 0d8c5ba42a075184f4383c62bd91e67fd5c4ccf0 (diff) | |
| download | CMake-0314f26412d3944f7ead47656e9347440141e815.zip CMake-0314f26412d3944f7ead47656e9347440141e815.tar.gz CMake-0314f26412d3944f7ead47656e9347440141e815.tar.bz2 | |
Merge topic 'FindOpenSSL-path-order'
0d8c5ba4 FindOpenSSL: Search in more-specific directories before less-specific
| -rw-r--r-- | Modules/FindOpenSSL.cmake | 12 |
1 files 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) |