[Cmake-commits] CMake branch, next, updated. v3.3.0-1564-g7c8e160

[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  7c8e1606394017c70f6f425e0aa09194628160a3 (commit)
       via  fbcbf7f29d630c8a291f0d0e543defbf1b8208df (commit)
       via  4c10461a877d8ca8f18c952c2c143320337d04a7 (commit)
      from  b31d8febcd4a4a6c0a00d1c764d7bd7cc0f7d770 (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=7c8e1606394017c70f6f425e0aa09194628160a3
commit 7c8e1606394017c70f6f425e0aa09194628160a3
Merge: b31d8fe fbcbf7f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 30 10:37:20 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 30 10:37:20 2015 -0400

    Merge topic 'FindOpenSSL-cleanup' into next
    
    fbcbf7f2 FindOpenSSL: De-duplicate find_library path suffixes on Windows
    4c10461a FindOpenSSL: Remove extra whitespace


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fbcbf7f29d630c8a291f0d0e543defbf1b8208df
commit fbcbf7f29d630c8a291f0d0e543defbf1b8208df
Author:     Thijs Wenker <me at thoys.nl>
AuthorDate: Thu Jul 30 16:09:34 2015 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jul 30 10:33:12 2015 -0400

    FindOpenSSL: De-duplicate find_library path suffixes on Windows
    
    Store the path suffixes in a variable and reference it in each
    find_library call.

diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
index ad22580..7545d94 100644
--- a/Modules/FindOpenSSL.cmake
+++ b/Modules/FindOpenSSL.cmake
@@ -99,15 +99,20 @@ if(WIN32 AND NOT CYGWIN)
     # We are using the libraries located in the VC subdir instead of the parent directory eventhough :
     # libeay32MD.lib is identical to ../libeay32.lib, and
     # ssleay32MD.lib is identical to ../ssleay32.lib
+
+    set(_OPENSSL_PATH_SUFFIXES
+      "lib"
+      "VC"
+      "lib/VC"
+      )
+
     find_library(LIB_EAY_DEBUG
       NAMES
         libeay32MDd
         libeay32d
       ${_OPENSSL_ROOT_HINTS_AND_PATHS}
       PATH_SUFFIXES
-        "lib"
-        "VC"
-        "lib/VC"
+        ${_OPENSSL_PATH_SUFFIXES}
     )
 
     find_library(LIB_EAY_RELEASE
@@ -116,9 +121,7 @@ if(WIN32 AND NOT CYGWIN)
         libeay32
       ${_OPENSSL_ROOT_HINTS_AND_PATHS}
       PATH_SUFFIXES
-        "lib"
-        "VC"
-        "lib/VC"
+        ${_OPENSSL_PATH_SUFFIXES}
     )
 
     find_library(SSL_EAY_DEBUG
@@ -127,9 +130,7 @@ if(WIN32 AND NOT CYGWIN)
         ssleay32d
       ${_OPENSSL_ROOT_HINTS_AND_PATHS}
       PATH_SUFFIXES
-        "lib"
-        "VC"
-        "lib/VC"
+        ${_OPENSSL_PATH_SUFFIXES}
     )
 
     find_library(SSL_EAY_RELEASE
@@ -139,9 +140,7 @@ if(WIN32 AND NOT CYGWIN)
         ssl
       ${_OPENSSL_ROOT_HINTS_AND_PATHS}
       PATH_SUFFIXES
-        "lib"
-        "VC"
-        "lib/VC"
+        ${_OPENSSL_PATH_SUFFIXES}
     )
 
     set(LIB_EAY_LIBRARY_DEBUG "${LIB_EAY_DEBUG}")

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4c10461a877d8ca8f18c952c2c143320337d04a7
commit 4c10461a877d8ca8f18c952c2c143320337d04a7
Author:     Thijs Wenker <me at thoys.nl>
AuthorDate: Thu Jul 30 16:09:34 2015 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jul 30 10:30:49 2015 -0400

    FindOpenSSL: Remove extra whitespace

diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
index 3adc269..ad22580 100644
--- a/Modules/FindOpenSSL.cmake
+++ b/Modules/FindOpenSSL.cmake
@@ -155,9 +155,9 @@ 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} )
+    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
     set(LIB_EAY_NAMES libeay32)
@@ -185,9 +185,9 @@ 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} )
+    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)
   else()
@@ -213,9 +213,9 @@ 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} )
+    set(OPENSSL_SSL_LIBRARY ${SSL_EAY} )
+    set(OPENSSL_CRYPTO_LIBRARY ${LIB_EAY} )
+    set(OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} )
   endif()
 else()
 

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

Summary of changes:
 Modules/FindOpenSSL.cmake |   41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 deletions(-)


hooks/post-receive
-- 
CMake