This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via afe04cdb3ddd4645e456e7b129466e782a31649e (commit)
via fb44b3374be48edd56e2c86818b55bb5ecef4500 (commit)
from 2d354f79c91b48d351ea737b190ca396be1630fc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=afe04cdb3ddd4645e456e7b129466e782a31649e
commit afe04cdb3ddd4645e456e7b129466e782a31649e
Merge: 2d354f7 fb44b33
Author: Rolf Eike Beer <e...@sf-mail.de>
AuthorDate: Fri Nov 2 19:01:07 2012 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Nov 2 19:01:07 2012 -0400
Merge topic 'fix-openssl-win' into next
fb44b33 FindOpenSSL: also find the non-MD debug libraries for MSVC
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fb44b3374be48edd56e2c86818b55bb5ecef4500
commit fb44b3374be48edd56e2c86818b55bb5ecef4500
Author: Rolf Eike Beer <e...@sf-mail.de>
AuthorDate: Fri Nov 2 23:59:08 2012 +0100
Commit: Rolf Eike Beer <e...@sf-mail.de>
CommitDate: Fri Nov 2 23:59:08 2012 +0100
FindOpenSSL: also find the non-MD debug libraries for MSVC
We already search for them in release mode.
diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
index 1f6d58c..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"
-----------------------------------------------------------------------
Summary of changes:
Modules/FindOpenSSL.cmake | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
