[Cmake-commits] CMake branch, next, updated. v2.8.10-712-g2d354f7
Rolf Eike Beer
eike at sf-mail.de
Fri Nov 2 15:41:52 EDT 2012
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 2d354f79c91b48d351ea737b190ca396be1630fc (commit)
via 2272a596096980780eb2c7da7d22359e047df52d (commit)
from 6596b6248fad49fcc70fafcb83352cf30df31179 (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=2d354f79c91b48d351ea737b190ca396be1630fc
commit 2d354f79c91b48d351ea737b190ca396be1630fc
Merge: 6596b62 2272a59
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Nov 2 15:41:50 2012 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Nov 2 15:41:50 2012 -0400
Merge topic 'fix-openssl-win' into next
2272a59 FindOpenSSL: fix library selection on Windows (#13645)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2272a596096980780eb2c7da7d22359e047df52d
commit 2272a596096980780eb2c7da7d22359e047df52d
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Nov 2 20:41:37 2012 +0100
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Fri Nov 2 20:41:37 2012 +0100
FindOpenSSL: fix library selection on Windows (#13645)
diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
index e2cc427..1f6d58c 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)
-----------------------------------------------------------------------
Summary of changes:
Modules/FindOpenSSL.cmake | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list