[Cmake-commits] CMake branch, next, updated. v3.5.1-804-gdd68821

[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  dd6882100ef94002e69e767aeb1dee6bb5c837a3 (commit)
       via  b148440381df0143a665b7ceebe8606a052e2cdf (commit)
      from  08e5b04dde6d60a6663a8fce4525f471830fb024 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dd6882100ef94002e69e767aeb1dee6bb5c837a3
commit dd6882100ef94002e69e767aeb1dee6bb5c837a3
Merge: 08e5b04 b148440
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Apr 5 09:36:19 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Apr 5 09:36:19 2016 -0400

    Merge topic 'FindOpenSSL-names-per-dir' into next
    
    b1484403 FindOpenSSL: Prefer libs early in search path regardless of name (#15887)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b148440381df0143a665b7ceebe8606a052e2cdf
commit b148440381df0143a665b7ceebe8606a052e2cdf
Author:     Hannes Mezger <hannes.mezger at ascolab.com>
AuthorDate: Mon Apr 4 14:23:23 2016 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Apr 5 09:32:08 2016 -0400

    FindOpenSSL: Prefer libs early in search path regardless of name (#15887)
    
    Add NAMES_PER_DIR to all find_library invocations so that we consider
    all possible names in each search directory before moving on to the next
    directory.  Otherwise we may not find self-built libraries first even if
    they appear early in the search path.

diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
index 8b4b988..8dbaf11 100644
--- a/Modules/FindOpenSSL.cmake
+++ b/Modules/FindOpenSSL.cmake
@@ -151,6 +151,7 @@ if(WIN32 AND NOT CYGWIN)
       NAMES
         libeay32${_OPENSSL_MSVC_RT_MODE}d
         libeay32d
+      NAMES_PER_DIR
       ${_OPENSSL_ROOT_HINTS_AND_PATHS}
       PATH_SUFFIXES
         ${_OPENSSL_PATH_SUFFIXES}
@@ -160,6 +161,7 @@ if(WIN32 AND NOT CYGWIN)
       NAMES
         libeay32${_OPENSSL_MSVC_RT_MODE}
         libeay32
+      NAMES_PER_DIR
       ${_OPENSSL_ROOT_HINTS_AND_PATHS}
       PATH_SUFFIXES
         ${_OPENSSL_PATH_SUFFIXES}
@@ -169,6 +171,7 @@ if(WIN32 AND NOT CYGWIN)
       NAMES
         ssleay32${_OPENSSL_MSVC_RT_MODE}d
         ssleay32d
+      NAMES_PER_DIR
       ${_OPENSSL_ROOT_HINTS_AND_PATHS}
       PATH_SUFFIXES
         ${_OPENSSL_PATH_SUFFIXES}
@@ -179,6 +182,7 @@ if(WIN32 AND NOT CYGWIN)
         ssleay32${_OPENSSL_MSVC_RT_MODE}
         ssleay32
         ssl
+      NAMES_PER_DIR
       ${_OPENSSL_ROOT_HINTS_AND_PATHS}
       PATH_SUFFIXES
         ${_OPENSSL_PATH_SUFFIXES}
@@ -205,6 +209,7 @@ if(WIN32 AND NOT CYGWIN)
     find_library(LIB_EAY
       NAMES
         ${LIB_EAY_NAMES}
+      NAMES_PER_DIR
       ${_OPENSSL_ROOT_HINTS_AND_PATHS}
       PATH_SUFFIXES
         "lib"
@@ -214,6 +219,7 @@ if(WIN32 AND NOT CYGWIN)
     find_library(SSL_EAY
       NAMES
         ${SSL_EAY_NAMES}
+      NAMES_PER_DIR
       ${_OPENSSL_ROOT_HINTS_AND_PATHS}
       PATH_SUFFIXES
         "lib"
@@ -231,6 +237,7 @@ if(WIN32 AND NOT CYGWIN)
     find_library(LIB_EAY
       NAMES
         libeay32
+      NAMES_PER_DIR
       ${_OPENSSL_ROOT_HINTS_AND_PATHS}
       HINTS
         ${_OPENSSL_LIBDIR}
@@ -241,6 +248,7 @@ if(WIN32 AND NOT CYGWIN)
     find_library(SSL_EAY
       NAMES
         ssleay32
+      NAMES_PER_DIR
       ${_OPENSSL_ROOT_HINTS_AND_PATHS}
       HINTS
         ${_OPENSSL_LIBDIR}
@@ -260,6 +268,7 @@ else()
       ssl
       ssleay32
       ssleay32MD
+    NAMES_PER_DIR
     ${_OPENSSL_ROOT_HINTS_AND_PATHS}
     HINTS
       ${_OPENSSL_LIBDIR}
@@ -270,6 +279,7 @@ else()
   find_library(OPENSSL_CRYPTO_LIBRARY
     NAMES
       crypto
+    NAMES_PER_DIR
     ${_OPENSSL_ROOT_HINTS_AND_PATHS}
     HINTS
       ${_OPENSSL_LIBDIR}

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

Summary of changes:
 Modules/FindOpenSSL.cmake |   10 ++++++++++
 1 file changed, 10 insertions(+)


hooks/post-receive
-- 
CMake