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

Merge topic 'FindOpenSSL-cleanup' 

fbcbf7f2 FindOpenSSL: De-duplicate find_library path suffixes on Windows
4c10461a FindOpenSSL: Remove extra whitespace
This commit is contained in:
Brad King 2015-07-31 09:21:49 -04:00 committed by CMake Topic Stage
parent 609e8b181a fbcbf7f29d
commit 8515f26a63
1 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
Modules/FindOpenSSL.cmake
View File

@ -99,15 +99,20 @@ if(WIN32 AND NOT CYGWIN)
# We are using the libraries located in the VC subdir instead of the parent directory eventhough : # We are using the libraries located in the VC subdir instead of the parent directory eventhough :
# libeay32MD.lib is identical to ../libeay32.lib, and # libeay32MD.lib is identical to ../libeay32.lib, and
# ssleay32MD.lib is identical to ../ssleay32.lib # ssleay32MD.lib is identical to ../ssleay32.lib
set(_OPENSSL_PATH_SUFFIXES
"lib"
"VC"
"lib/VC"
)
find_library(LIB_EAY_DEBUG find_library(LIB_EAY_DEBUG
NAMES NAMES
libeay32MDd libeay32MDd
libeay32d libeay32d
${_OPENSSL_ROOT_HINTS_AND_PATHS} ${_OPENSSL_ROOT_HINTS_AND_PATHS}
PATH_SUFFIXES PATH_SUFFIXES
"lib" ${_OPENSSL_PATH_SUFFIXES}
"VC"
"lib/VC"
) )
find_library(LIB_EAY_RELEASE find_library(LIB_EAY_RELEASE
@ -116,9 +121,7 @@ if(WIN32 AND NOT CYGWIN)
libeay32 libeay32
${_OPENSSL_ROOT_HINTS_AND_PATHS} ${_OPENSSL_ROOT_HINTS_AND_PATHS}
PATH_SUFFIXES PATH_SUFFIXES
"lib" ${_OPENSSL_PATH_SUFFIXES}
"VC"
"lib/VC"
) )
find_library(SSL_EAY_DEBUG find_library(SSL_EAY_DEBUG
@ -127,9 +130,7 @@ if(WIN32 AND NOT CYGWIN)
ssleay32d ssleay32d
${_OPENSSL_ROOT_HINTS_AND_PATHS} ${_OPENSSL_ROOT_HINTS_AND_PATHS}
PATH_SUFFIXES PATH_SUFFIXES
"lib" ${_OPENSSL_PATH_SUFFIXES}
"VC"
"lib/VC"
) )
find_library(SSL_EAY_RELEASE find_library(SSL_EAY_RELEASE
@ -139,9 +140,7 @@ if(WIN32 AND NOT CYGWIN)
ssl ssl
${_OPENSSL_ROOT_HINTS_AND_PATHS} ${_OPENSSL_ROOT_HINTS_AND_PATHS}
PATH_SUFFIXES PATH_SUFFIXES
"lib" ${_OPENSSL_PATH_SUFFIXES}
"VC"
"lib/VC"
) )
set(LIB_EAY_LIBRARY_DEBUG "${LIB_EAY_DEBUG}") set(LIB_EAY_LIBRARY_DEBUG "${LIB_EAY_DEBUG}")
@ -155,9 +154,9 @@ if(WIN32 AND NOT CYGWIN)
mark_as_advanced(LIB_EAY_LIBRARY_DEBUG LIB_EAY_LIBRARY_RELEASE mark_as_advanced(LIB_EAY_LIBRARY_DEBUG LIB_EAY_LIBRARY_RELEASE
SSL_EAY_LIBRARY_DEBUG SSL_EAY_LIBRARY_RELEASE) SSL_EAY_LIBRARY_DEBUG SSL_EAY_LIBRARY_RELEASE)
set( OPENSSL_SSL_LIBRARY ${SSL_EAY_LIBRARY} ) set(OPENSSL_SSL_LIBRARY ${SSL_EAY_LIBRARY} )
set( OPENSSL_CRYPTO_LIBRARY ${LIB_EAY_LIBRARY} ) set(OPENSSL_CRYPTO_LIBRARY ${LIB_EAY_LIBRARY} )
set( OPENSSL_LIBRARIES ${SSL_EAY_LIBRARY} ${LIB_EAY_LIBRARY} ) set(OPENSSL_LIBRARIES ${SSL_EAY_LIBRARY} ${LIB_EAY_LIBRARY} )
elseif(MINGW) elseif(MINGW)
# same player, for MinGW # same player, for MinGW
set(LIB_EAY_NAMES libeay32) set(LIB_EAY_NAMES libeay32)
@ -185,9 +184,9 @@ if(WIN32 AND NOT CYGWIN)
) )
mark_as_advanced(SSL_EAY LIB_EAY) mark_as_advanced(SSL_EAY LIB_EAY)
set( OPENSSL_SSL_LIBRARY ${SSL_EAY} ) set(OPENSSL_SSL_LIBRARY ${SSL_EAY} )
set( OPENSSL_CRYPTO_LIBRARY ${LIB_EAY} ) set(OPENSSL_CRYPTO_LIBRARY ${LIB_EAY} )
set( OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} ) set(OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} )
unset(LIB_EAY_NAMES) unset(LIB_EAY_NAMES)
unset(SSL_EAY_NAMES) unset(SSL_EAY_NAMES)
else() else()
@ -213,9 +212,9 @@ if(WIN32 AND NOT CYGWIN)
) )
mark_as_advanced(SSL_EAY LIB_EAY) mark_as_advanced(SSL_EAY LIB_EAY)
set( OPENSSL_SSL_LIBRARY ${SSL_EAY} ) set(OPENSSL_SSL_LIBRARY ${SSL_EAY} )
set( OPENSSL_CRYPTO_LIBRARY ${LIB_EAY} ) set(OPENSSL_CRYPTO_LIBRARY ${LIB_EAY} )
set( OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} ) set(OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} )
endif() endif()
else() else()