kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Hannes Mezger 2016-04-04 14:23:23 +02:00 committed by Brad King
parent e0cc8bf5d7
commit b148440381
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Modules/FindOpenSSL.cmake
View File

@ -151,6 +151,7 @@ if(WIN32 AND NOT CYGWIN)
NAMES NAMES
libeay32${_OPENSSL_MSVC_RT_MODE}d libeay32${_OPENSSL_MSVC_RT_MODE}d
libeay32d libeay32d
NAMES_PER_DIR
${_OPENSSL_ROOT_HINTS_AND_PATHS} ${_OPENSSL_ROOT_HINTS_AND_PATHS}
PATH_SUFFIXES PATH_SUFFIXES
${_OPENSSL_PATH_SUFFIXES} ${_OPENSSL_PATH_SUFFIXES}
@ -160,6 +161,7 @@ if(WIN32 AND NOT CYGWIN)
NAMES NAMES
libeay32${_OPENSSL_MSVC_RT_MODE} libeay32${_OPENSSL_MSVC_RT_MODE}
libeay32 libeay32
NAMES_PER_DIR
${_OPENSSL_ROOT_HINTS_AND_PATHS} ${_OPENSSL_ROOT_HINTS_AND_PATHS}
PATH_SUFFIXES PATH_SUFFIXES
${_OPENSSL_PATH_SUFFIXES} ${_OPENSSL_PATH_SUFFIXES}
@ -169,6 +171,7 @@ if(WIN32 AND NOT CYGWIN)
NAMES NAMES
ssleay32${_OPENSSL_MSVC_RT_MODE}d ssleay32${_OPENSSL_MSVC_RT_MODE}d
ssleay32d ssleay32d
NAMES_PER_DIR
${_OPENSSL_ROOT_HINTS_AND_PATHS} ${_OPENSSL_ROOT_HINTS_AND_PATHS}
PATH_SUFFIXES PATH_SUFFIXES
${_OPENSSL_PATH_SUFFIXES} ${_OPENSSL_PATH_SUFFIXES}
@ -179,6 +182,7 @@ if(WIN32 AND NOT CYGWIN)
ssleay32${_OPENSSL_MSVC_RT_MODE} ssleay32${_OPENSSL_MSVC_RT_MODE}
ssleay32 ssleay32
ssl ssl
NAMES_PER_DIR
${_OPENSSL_ROOT_HINTS_AND_PATHS} ${_OPENSSL_ROOT_HINTS_AND_PATHS}
PATH_SUFFIXES PATH_SUFFIXES
${_OPENSSL_PATH_SUFFIXES} ${_OPENSSL_PATH_SUFFIXES}
@ -205,6 +209,7 @@ if(WIN32 AND NOT CYGWIN)
find_library(LIB_EAY find_library(LIB_EAY
NAMES NAMES
${LIB_EAY_NAMES} ${LIB_EAY_NAMES}
NAMES_PER_DIR
${_OPENSSL_ROOT_HINTS_AND_PATHS} ${_OPENSSL_ROOT_HINTS_AND_PATHS}
PATH_SUFFIXES PATH_SUFFIXES
"lib" "lib"
@ -214,6 +219,7 @@ if(WIN32 AND NOT CYGWIN)
find_library(SSL_EAY find_library(SSL_EAY
NAMES NAMES
${SSL_EAY_NAMES} ${SSL_EAY_NAMES}
NAMES_PER_DIR
${_OPENSSL_ROOT_HINTS_AND_PATHS} ${_OPENSSL_ROOT_HINTS_AND_PATHS}
PATH_SUFFIXES PATH_SUFFIXES
"lib" "lib"
@ -231,6 +237,7 @@ if(WIN32 AND NOT CYGWIN)
find_library(LIB_EAY find_library(LIB_EAY
NAMES NAMES
libeay32 libeay32
NAMES_PER_DIR
${_OPENSSL_ROOT_HINTS_AND_PATHS} ${_OPENSSL_ROOT_HINTS_AND_PATHS}
HINTS HINTS
${_OPENSSL_LIBDIR} ${_OPENSSL_LIBDIR}
@ -241,6 +248,7 @@ if(WIN32 AND NOT CYGWIN)
find_library(SSL_EAY find_library(SSL_EAY
NAMES NAMES
ssleay32 ssleay32
NAMES_PER_DIR
${_OPENSSL_ROOT_HINTS_AND_PATHS} ${_OPENSSL_ROOT_HINTS_AND_PATHS}
HINTS HINTS
${_OPENSSL_LIBDIR} ${_OPENSSL_LIBDIR}
@ -260,6 +268,7 @@ else()
ssl ssl
ssleay32 ssleay32
ssleay32MD ssleay32MD
NAMES_PER_DIR
${_OPENSSL_ROOT_HINTS_AND_PATHS} ${_OPENSSL_ROOT_HINTS_AND_PATHS}
HINTS HINTS
${_OPENSSL_LIBDIR} ${_OPENSSL_LIBDIR}
@ -270,6 +279,7 @@ else()
find_library(OPENSSL_CRYPTO_LIBRARY find_library(OPENSSL_CRYPTO_LIBRARY
NAMES NAMES
crypto crypto
NAMES_PER_DIR
${_OPENSSL_ROOT_HINTS_AND_PATHS} ${_OPENSSL_ROOT_HINTS_AND_PATHS}
HINTS HINTS
${_OPENSSL_LIBDIR} ${_OPENSSL_LIBDIR}