[Cmake-commits] CMake branch, next, updated. v3.6.2-2368-g30236d7

[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  30236d7e4ec1d23d2d668f698fa643414ec1b3a1 (commit)
       via  0d8c5ba42a075184f4383c62bd91e67fd5c4ccf0 (commit)
      from  d805f1e55d5ea409b307aa3fa1af5e05430768b8 (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=30236d7e4ec1d23d2d668f698fa643414ec1b3a1
commit 30236d7e4ec1d23d2d668f698fa643414ec1b3a1
Merge: d805f1e 0d8c5ba
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 22 11:39:28 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 22 11:39:28 2016 -0400

    Merge topic 'FindOpenSSL-path-order' into next
    
    0d8c5ba4 FindOpenSSL: Search in more-specific directories before less-specific


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0d8c5ba42a075184f4383c62bd91e67fd5c4ccf0
commit 0d8c5ba42a075184f4383c62bd91e67fd5c4ccf0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 22 07:55:27 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Sep 22 07:55:27 2016 -0400

    FindOpenSSL: Search in more-specific directories before less-specific
    
    Since commit v3.6.0-rc1~182^2 (FindOpenSSL: Prefer libs early in search
    path regardless of name, 2016-04-04) we use the `NAMES_PER_DIR` option
    to `find_library` calls to consider all names in each directory before
    moving on to the next directory.  Fix our library search directory
    ordering to place more-specific (e.g. VC/) directories before the
    general directories.  Otherwise they may never be considered.
    
    Closes: #16320

diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
index 7ddd783..034b0e6 100644
--- a/Modules/FindOpenSSL.cmake
+++ b/Modules/FindOpenSSL.cmake
@@ -142,15 +142,15 @@ if(WIN32 AND NOT CYGWIN)
 
     if(OPENSSL_USE_STATIC_LIBS)
       set(_OPENSSL_PATH_SUFFIXES
-        "lib"
-        "VC/static"
         "lib/VC/static"
+        "VC/static"
+        "lib"
         )
     else()
       set(_OPENSSL_PATH_SUFFIXES
-        "lib"
-        "VC"
         "lib/VC"
+        "VC"
+        "lib"
         )
     endif ()
 
@@ -227,8 +227,8 @@ if(WIN32 AND NOT CYGWIN)
       NAMES_PER_DIR
       ${_OPENSSL_ROOT_HINTS_AND_PATHS}
       PATH_SUFFIXES
-        "lib"
         "lib/MinGW"
+        "lib"
     )
 
     find_library(SSL_EAY
@@ -237,8 +237,8 @@ if(WIN32 AND NOT CYGWIN)
       NAMES_PER_DIR
       ${_OPENSSL_ROOT_HINTS_AND_PATHS}
       PATH_SUFFIXES
-        "lib"
         "lib/MinGW"
+        "lib"
     )
 
     mark_as_advanced(SSL_EAY LIB_EAY)

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

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


hooks/post-receive
-- 
CMake