[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-947-g28a1114

[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  28a11146379a6bad5729291def6b80ac678f0f87 (commit)
       via  be9bec5df2660661984e080dad9ae7561aa1fe83 (commit)
      from  e7921fa876e4de60d7e2201d07132cb6e8a61579 (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=28a11146379a6bad5729291def6b80ac678f0f87
commit 28a11146379a6bad5729291def6b80ac678f0f87
Merge: e7921fa be9bec5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Dec 1 09:44:16 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Dec 1 09:44:16 2014 -0500

    Merge topic 'FindOpenSSL-separate-libs' into next
    
    be9bec5d FindOpenSSL: Report crypto and ssl libraries separately


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=be9bec5df2660661984e080dad9ae7561aa1fe83
commit be9bec5df2660661984e080dad9ae7561aa1fe83
Author:     Hannes Mezger <hannes.mezger at ascolab.com>
AuthorDate: Fri Nov 28 15:21:53 2014 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Dec 1 09:41:46 2014 -0500

    FindOpenSSL: Report crypto and ssl libraries separately
    
    Some applications only need the OpenSSL crypto library and want to avoid
    linking against the SSL library.  Set OPENSSL_CRYPTO_LIBRARY and
    OPENSSL_SSL_LIBRARY in the code paths that do not need to find them
    separately, and document them publicly.  This allows applications to be
    more specific when linking against OpenSSL.

diff --git a/Help/release/dev/FindOpenSSL-separate-libs.rst b/Help/release/dev/FindOpenSSL-separate-libs.rst
new file mode 100644
index 0000000..96e3961
--- /dev/null
+++ b/Help/release/dev/FindOpenSSL-separate-libs.rst
@@ -0,0 +1,7 @@
+FindOpenSSL-separate-libs
+-------------------------
+
+* The :module:`FindOpenSSL` module now reports ``crypto`` and ``ssl``
+  libraries separately in ``OPENSSL_CRYPTO_LIBRARY`` and
+  ``OPENSSL_SSL_LIBRARY``, respectively, to allow applications to
+  link to one without the other.
diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
index 340b417..b2722a6 100644
--- a/Modules/FindOpenSSL.cmake
+++ b/Modules/FindOpenSSL.cmake
@@ -16,10 +16,12 @@
 #
 # ::
 #
-#   OPENSSL_FOUND - system has the OpenSSL library
-#   OPENSSL_INCLUDE_DIR - the OpenSSL include directory
-#   OPENSSL_LIBRARIES - The libraries needed to use OpenSSL
-#   OPENSSL_VERSION - This is set to $major.$minor.$revision$path (eg. 0.9.8s)
+#   OPENSSL_FOUND - System has the OpenSSL library
+#   OPENSSL_INCLUDE_DIR - The OpenSSL include directory
+#   OPENSSL_CRYPTO_LIBRARY - The OpenSSL crypto library
+#   OPENSSL_SSL_LIBRARY - The OpenSSL SSL library
+#   OPENSSL_LIBRARIES - All OpenSSL libraries
+#   OPENSSL_VERSION - This is set to $major.$minor.$revision$patch (eg. 0.9.8s)
 
 #=============================================================================
 # Copyright 2006-2009 Kitware, Inc.
@@ -153,6 +155,8 @@ if(WIN32 AND NOT CYGWIN)
 
     mark_as_advanced(LIB_EAY_LIBRARY_DEBUG LIB_EAY_LIBRARY_RELEASE
                      SSL_EAY_LIBRARY_DEBUG SSL_EAY_LIBRARY_RELEASE)
+    set( OPENSSL_SSL_LIBRARY ${SSL_EAY_LIBRARY} )
+    set( OPENSSL_CRYPTO_LIBRARY ${LIB_EAY_LIBRARY} )
     set( OPENSSL_LIBRARIES ${SSL_EAY_LIBRARY} ${LIB_EAY_LIBRARY} )
   elseif(MINGW)
     # same player, for MinGW
@@ -181,6 +185,8 @@ if(WIN32 AND NOT CYGWIN)
     )
 
     mark_as_advanced(SSL_EAY LIB_EAY)
+    set( OPENSSL_SSL_LIBRARY ${SSL_EAY} )
+    set( OPENSSL_CRYPTO_LIBRARY ${LIB_EAY} )
     set( OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} )
     unset(LIB_EAY_NAMES)
     unset(SSL_EAY_NAMES)
@@ -207,6 +213,8 @@ if(WIN32 AND NOT CYGWIN)
     )
 
     mark_as_advanced(SSL_EAY LIB_EAY)
+    set( OPENSSL_SSL_LIBRARY ${SSL_EAY} )
+    set( OPENSSL_CRYPTO_LIBRARY ${LIB_EAY} )
     set( OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} )
   endif()
 else()

-----------------------------------------------------------------------

Summary of changes:
 Help/release/dev/FindOpenSSL-separate-libs.rst |    7 +++++++
 Modules/FindOpenSSL.cmake                      |   16 ++++++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 Help/release/dev/FindOpenSSL-separate-libs.rst


hooks/post-receive
-- 
CMake