diff options
| author | Brad King <brad.king@kitware.com> | 2012-11-06 19:12:54 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-11-06 19:12:54 (GMT) |
| commit | 163802e8a146c48c13561fd26ba786aa1001e6b2 (patch) | |
| tree | 723ab2d372da459d190978dcc738a036d9b8e7cd /Modules | |
| parent | 11d0ad50adaa41d5c8d6437572c483f7c2f074e5 (diff) | |
| parent | 4a4c0ee78018ef96236b356e0ef7a4583fdfa580 (diff) | |
| download | CMake-163802e8a146c48c13561fd26ba786aa1001e6b2.zip CMake-163802e8a146c48c13561fd26ba786aa1001e6b2.tar.gz CMake-163802e8a146c48c13561fd26ba786aa1001e6b2.tar.bz2 | |
Merge topic 'fix-openssl-win'
4a4c0ee FindOpenSSL: also find the non-MD debug libraries for MSVC
894b775 FindOpenSSL: fix library selection on Windows (#13645)
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindOpenSSL.cmake | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake index e2cc427..224c88e 100644 --- a/Modules/FindOpenSSL.cmake +++ b/Modules/FindOpenSSL.cmake @@ -87,6 +87,7 @@ if(WIN32 AND NOT CYGWIN) find_library(LIB_EAY_DEBUG NAMES libeay32MDd + libeay32d ${_OPENSSL_ROOT_HINTS_AND_PATHS} PATH_SUFFIXES "lib" @@ -108,6 +109,7 @@ if(WIN32 AND NOT CYGWIN) find_library(SSL_EAY_DEBUG NAMES ssleay32MDd + ssleay32d ${_OPENSSL_ROOT_HINTS_AND_PATHS} PATH_SUFFIXES "lib" @@ -127,6 +129,11 @@ if(WIN32 AND NOT CYGWIN) "lib/VC" ) + set(LIB_EAY_LIBRARY_DEBUG "${LIB_EAY_DEBUG}") + set(LIB_EAY_LIBRARY_RELEASE "${LIB_EAY_RELEASE}") + set(SSL_EAY_LIBRARY_DEBUG "${SSL_EAY_DEBUG}") + set(SSL_EAY_LIBRARY_RELEASE "${SSL_EAY_RELEASE}") + include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake) select_library_configurations(LIB_EAY) select_library_configurations(SSL_EAY) |