[Cmake-commits] CMake branch, next, updated. v2.8.12.2-7784-g93d5dc8

[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  93d5dc8f86a1363bb5bd38909814ed27eabeb7ba (commit)
       via  e346c47ac55e6cb96c5747f1555fd7d4f8af9cbc (commit)
      from  295828d68d31b7700f15bd75fc0eb736b4c0428d (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=93d5dc8f86a1363bb5bd38909814ed27eabeb7ba
commit 93d5dc8f86a1363bb5bd38909814ed27eabeb7ba
Merge: 295828d e346c47
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 18 15:06:46 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 18 15:06:46 2014 -0500

    Merge topic 'FindOpenSSL-prefer-root' into next
    
    e346c47a FindOpenSSL: Prefer OPENSSL_ROOT_DIR first (#14764)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e346c47ac55e6cb96c5747f1555fd7d4f8af9cbc
commit e346c47ac55e6cb96c5747f1555fd7d4f8af9cbc
Author:     Ho Cheung <hocheung20 at gmail.com>
AuthorDate: Tue Feb 18 12:39:01 2014 -0600
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 18 15:05:32 2014 -0500

    FindOpenSSL: Prefer OPENSSL_ROOT_DIR first (#14764)
    
    Use hints computed from this explicit variable before those
    computed by PkgConfig.  They are more specific.

diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
index cb99f7a..340b417 100644
--- a/Modules/FindOpenSSL.cmake
+++ b/Modules/FindOpenSSL.cmake
@@ -74,9 +74,9 @@ set(_OPENSSL_ROOT_HINTS_AND_PATHS
 find_path(OPENSSL_INCLUDE_DIR
   NAMES
     openssl/ssl.h
+  ${_OPENSSL_ROOT_HINTS_AND_PATHS}
   HINTS
     ${_OPENSSL_INCLUDEDIR}
-  ${_OPENSSL_ROOT_HINTS_AND_PATHS}
   PATH_SUFFIXES
     include
 )
@@ -189,9 +189,9 @@ if(WIN32 AND NOT CYGWIN)
     find_library(LIB_EAY
       NAMES
         libeay32
+      ${_OPENSSL_ROOT_HINTS_AND_PATHS}
       HINTS
         ${_OPENSSL_LIBDIR}
-      ${_OPENSSL_ROOT_HINTS_AND_PATHS}
       PATH_SUFFIXES
         lib
     )
@@ -199,9 +199,9 @@ if(WIN32 AND NOT CYGWIN)
     find_library(SSL_EAY
       NAMES
         ssleay32
+      ${_OPENSSL_ROOT_HINTS_AND_PATHS}
       HINTS
         ${_OPENSSL_LIBDIR}
-      ${_OPENSSL_ROOT_HINTS_AND_PATHS}
       PATH_SUFFIXES
         lib
     )
@@ -216,9 +216,9 @@ else()
       ssl
       ssleay32
       ssleay32MD
+    ${_OPENSSL_ROOT_HINTS_AND_PATHS}
     HINTS
       ${_OPENSSL_LIBDIR}
-    ${_OPENSSL_ROOT_HINTS_AND_PATHS}
     PATH_SUFFIXES
       lib
   )
@@ -226,9 +226,9 @@ else()
   find_library(OPENSSL_CRYPTO_LIBRARY
     NAMES
       crypto
+    ${_OPENSSL_ROOT_HINTS_AND_PATHS}
     HINTS
       ${_OPENSSL_LIBDIR}
-    ${_OPENSSL_ROOT_HINTS_AND_PATHS}
     PATH_SUFFIXES
       lib
   )

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

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


hooks/post-receive
-- 
CMake