diff options
| author | Hannes Mezger <hannes.mezger@ascolab.com> | 2016-04-04 12:23:23 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-04-05 13:32:08 (GMT) |
| commit | b148440381df0143a665b7ceebe8606a052e2cdf (patch) | |
| tree | b55b04c3e3af24def9d8eea158bad39fa32a97be /Modules | |
| parent | e0cc8bf5d7f82cf38ef5e1a643843e244a8f98d6 (diff) | |
| download | CMake-b148440381df0143a665b7ceebe8606a052e2cdf.zip CMake-b148440381df0143a665b7ceebe8606a052e2cdf.tar.gz CMake-b148440381df0143a665b7ceebe8606a052e2cdf.tar.bz2 | |
FindOpenSSL: Prefer libs early in search path regardless of name (#15887)
Add NAMES_PER_DIR to all find_library invocations so that we consider
all possible names in each search directory before moving on to the next
directory. Otherwise we may not find self-built libraries first even if
they appear early in the search path.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindOpenSSL.cmake | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake index 8b4b988..8dbaf11 100644 --- a/Modules/FindOpenSSL.cmake +++ b/Modules/FindOpenSSL.cmake @@ -151,6 +151,7 @@ if(WIN32 AND NOT CYGWIN) NAMES libeay32${_OPENSSL_MSVC_RT_MODE}d libeay32d + NAMES_PER_DIR ${_OPENSSL_ROOT_HINTS_AND_PATHS} PATH_SUFFIXES ${_OPENSSL_PATH_SUFFIXES} @@ -160,6 +161,7 @@ if(WIN32 AND NOT CYGWIN) NAMES libeay32${_OPENSSL_MSVC_RT_MODE} libeay32 + NAMES_PER_DIR ${_OPENSSL_ROOT_HINTS_AND_PATHS} PATH_SUFFIXES ${_OPENSSL_PATH_SUFFIXES} @@ -169,6 +171,7 @@ if(WIN32 AND NOT CYGWIN) NAMES ssleay32${_OPENSSL_MSVC_RT_MODE}d ssleay32d + NAMES_PER_DIR ${_OPENSSL_ROOT_HINTS_AND_PATHS} PATH_SUFFIXES ${_OPENSSL_PATH_SUFFIXES} @@ -179,6 +182,7 @@ if(WIN32 AND NOT CYGWIN) ssleay32${_OPENSSL_MSVC_RT_MODE} ssleay32 ssl + NAMES_PER_DIR ${_OPENSSL_ROOT_HINTS_AND_PATHS} PATH_SUFFIXES ${_OPENSSL_PATH_SUFFIXES} @@ -205,6 +209,7 @@ if(WIN32 AND NOT CYGWIN) find_library(LIB_EAY NAMES ${LIB_EAY_NAMES} + NAMES_PER_DIR ${_OPENSSL_ROOT_HINTS_AND_PATHS} PATH_SUFFIXES "lib" @@ -214,6 +219,7 @@ if(WIN32 AND NOT CYGWIN) find_library(SSL_EAY NAMES ${SSL_EAY_NAMES} + NAMES_PER_DIR ${_OPENSSL_ROOT_HINTS_AND_PATHS} PATH_SUFFIXES "lib" @@ -231,6 +237,7 @@ if(WIN32 AND NOT CYGWIN) find_library(LIB_EAY NAMES libeay32 + NAMES_PER_DIR ${_OPENSSL_ROOT_HINTS_AND_PATHS} HINTS ${_OPENSSL_LIBDIR} @@ -241,6 +248,7 @@ if(WIN32 AND NOT CYGWIN) find_library(SSL_EAY NAMES ssleay32 + NAMES_PER_DIR ${_OPENSSL_ROOT_HINTS_AND_PATHS} HINTS ${_OPENSSL_LIBDIR} @@ -260,6 +268,7 @@ else() ssl ssleay32 ssleay32MD + NAMES_PER_DIR ${_OPENSSL_ROOT_HINTS_AND_PATHS} HINTS ${_OPENSSL_LIBDIR} @@ -270,6 +279,7 @@ else() find_library(OPENSSL_CRYPTO_LIBRARY NAMES crypto + NAMES_PER_DIR ${_OPENSSL_ROOT_HINTS_AND_PATHS} HINTS ${_OPENSSL_LIBDIR} |