[Cmake-commits] CMake branch, next, updated. v2.8.10-737-g6a480dc

[Brad King]

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  6a480dcb4ebdbe1df053e8887dabf523aeda0edc (commit)
       via  4a4c0ee78018ef96236b356e0ef7a4583fdfa580 (commit)
       via  894b775fa722a3f58677f506a9ed0baceab0a119 (commit)
      from  d3d9daeebb06dcf5502ed69d690d45b8011f0eea (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=6a480dcb4ebdbe1df053e8887dabf523aeda0edc
commit 6a480dcb4ebdbe1df053e8887dabf523aeda0edc
Merge: d3d9dae 4a4c0ee
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 5 08:19:37 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 5 08:19:37 2012 -0500

    Merge topic 'fix-openssl-win' into next
    
    4a4c0ee FindOpenSSL: also find the non-MD debug libraries for MSVC
    894b775 FindOpenSSL: fix library selection on Windows (#13645)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4a4c0ee78018ef96236b356e0ef7a4583fdfa580
commit 4a4c0ee78018ef96236b356e0ef7a4583fdfa580
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Nov 2 23:59:08 2012 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 5 08:17:02 2012 -0500

    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"

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=894b775fa722a3f58677f506a9ed0baceab0a119
commit 894b775fa722a3f58677f506a9ed0baceab0a119
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Nov 2 20:41:37 2012 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 5 08:17:02 2012 -0500

    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:


hooks/post-receive
-- 
CMake