diff options
| author | Rolf Eike Beer <eike@sf-mail.de> | 2012-07-23 19:00:40 (GMT) |
|---|---|---|
| committer | Rolf Eike Beer <eike@sf-mail.de> | 2012-07-29 14:53:39 (GMT) |
| commit | 7464519304636703e2b08a1b89f2d9069d8eb096 (patch) | |
| tree | c0c616c851517089ebe18b53cce26d628c9b681c | |
| parent | 4b793ad1965579836a05a5d55b6ff30849909928 (diff) | |
| download | CMake-7464519304636703e2b08a1b89f2d9069d8eb096.zip CMake-7464519304636703e2b08a1b89f2d9069d8eb096.tar.gz CMake-7464519304636703e2b08a1b89f2d9069d8eb096.tar.bz2 | |
FindOpenSSL: use SelectLibraryConfigurations
| -rw-r--r-- | Modules/FindOpenSSL.cmake | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake index c19667d..bd46c9f 100644 --- a/Modules/FindOpenSSL.cmake +++ b/Modules/FindOpenSSL.cmake @@ -79,7 +79,6 @@ IF(WIN32 AND NOT CYGWIN) FIND_LIBRARY(LIB_EAY_DEBUG NAMES libeay32MDd - libeay32 ${_OPENSSL_ROOT_HINTS_AND_PATHS} PATH_SUFFIXES "lib" @@ -101,8 +100,6 @@ IF(WIN32 AND NOT CYGWIN) FIND_LIBRARY(SSL_EAY_DEBUG NAMES ssleay32MDd - ssleay32 - ssl ${_OPENSSL_ROOT_HINTS_AND_PATHS} PATH_SUFFIXES "lib" @@ -122,16 +119,11 @@ IF(WIN32 AND NOT CYGWIN) "lib/VC" ) - if( CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE ) - set( OPENSSL_LIBRARIES - optimized ${SSL_EAY_RELEASE} debug ${SSL_EAY_DEBUG} - optimized ${LIB_EAY_RELEASE} debug ${LIB_EAY_DEBUG} - ) - else() - set( OPENSSL_LIBRARIES ${SSL_EAY_RELEASE} ${LIB_EAY_RELEASE} ) - endif() - MARK_AS_ADVANCED(SSL_EAY_DEBUG SSL_EAY_RELEASE) - MARK_AS_ADVANCED(LIB_EAY_DEBUG LIB_EAY_RELEASE) + include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake) + select_library_configurations(LIB_EAY) + select_library_configurations(SSL_EAY) + + set( OPENSSL_LIBRARIES ${SSL_EAY_LIBRARY} ${LIB_EAY_LIBRARY} ) ELSEIF(MINGW) # same player, for MingW SET(LIB_EAY_NAMES libeay32) |