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

Merge topic 'FindOpenSSL-path-order' 

0d8c5ba4 FindOpenSSL: Search in more-specific directories before less-specific
This commit is contained in:
Brad King 2016-09-23 08:40:00 -04:00 committed by CMake Topic Stage
parent 785f875426 0d8c5ba42a
commit 0314f26412
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Modules/FindOpenSSL.cmake
View File

@ -142,15 +142,15 @@ if(WIN32 AND NOT CYGWIN)
if(OPENSSL_USE_STATIC_LIBS) if(OPENSSL_USE_STATIC_LIBS)
set(_OPENSSL_PATH_SUFFIXES set(_OPENSSL_PATH_SUFFIXES
"lib"
"VC/static"
"lib/VC/static" "lib/VC/static"
"VC/static"
"lib"
) )
else() else()
set(_OPENSSL_PATH_SUFFIXES set(_OPENSSL_PATH_SUFFIXES
"lib"
"VC"
"lib/VC" "lib/VC"
"VC"
"lib"
) )
endif () endif ()
@ -227,8 +227,8 @@ if(WIN32 AND NOT CYGWIN)
NAMES_PER_DIR NAMES_PER_DIR
${_OPENSSL_ROOT_HINTS_AND_PATHS} ${_OPENSSL_ROOT_HINTS_AND_PATHS}
PATH_SUFFIXES PATH_SUFFIXES
"lib"
"lib/MinGW" "lib/MinGW"
"lib"
) )
find_library(SSL_EAY find_library(SSL_EAY
@ -237,8 +237,8 @@ if(WIN32 AND NOT CYGWIN)
NAMES_PER_DIR NAMES_PER_DIR
${_OPENSSL_ROOT_HINTS_AND_PATHS} ${_OPENSSL_ROOT_HINTS_AND_PATHS}
PATH_SUFFIXES PATH_SUFFIXES
"lib"
"lib/MinGW" "lib/MinGW"
"lib"
) )
mark_as_advanced(SSL_EAY LIB_EAY) mark_as_advanced(SSL_EAY LIB_EAY)