From 894b775fa722a3f58677f506a9ed0baceab0a119 Mon Sep 17 00:00:00 2001 From: Rolf Eike Beer Date: Fri, 2 Nov 2012 20:41:37 +0100 Subject: [PATCH 1/2] FindOpenSSL: fix library selection on Windows (#13645) --- Modules/FindOpenSSL.cmake | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake index e2cc42702..1f6d58cea 100644 --- a/Modules/FindOpenSSL.cmake +++ b/Modules/FindOpenSSL.cmake @@ -127,6 +127,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) From 4a4c0ee78018ef96236b356e0ef7a4583fdfa580 Mon Sep 17 00:00:00 2001 From: Rolf Eike Beer Date: Fri, 2 Nov 2012 23:59:08 +0100 Subject: [PATCH 2/2] FindOpenSSL: also find the non-MD debug libraries for MSVC We already search for them in release mode. --- Modules/FindOpenSSL.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake index 1f6d58cea..224c88e0e 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"