[Cmake-commits] CMake branch, next, updated. v2.8.12.2-7457-ga549825

[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  a5498254c7675145a248c68bedd636af767270f2 (commit)
       via  12d6eb639d3fc7dd9b9a1280d462a47c5f123120 (commit)
      from  bdbcbc240c697eb7a5b02f6e6ae54c24d53821b8 (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=a5498254c7675145a248c68bedd636af767270f2
commit a5498254c7675145a248c68bedd636af767270f2
Merge: bdbcbc2 12d6eb6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 5 12:28:29 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 5 12:28:29 2014 -0500

    Merge topic 'FindOpenSSL-root-dir' into next
    
    12d6eb63 FindOpenSSL: Honor OPENSSL_ROOT_DIR everywhere (#14735)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=12d6eb639d3fc7dd9b9a1280d462a47c5f123120
commit 12d6eb639d3fc7dd9b9a1280d462a47c5f123120
Author:     Ho Cheung <hocheung20 at gmail.com>
AuthorDate: Tue Feb 4 18:13:59 2014 -0600
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 5 12:28:36 2014 -0500

    FindOpenSSL: Honor OPENSSL_ROOT_DIR everywhere (#14735)
    
    In commit v2.8.5~176^2~2 (FindOpenSSL: We should only use hints to find
    OpenSSL, 2011-03-28) values for HINTS and PATHS of find_* calls were
    computed everywhere but only used on Windows.  Use them everywhere.

diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
index 6bf2aad..cb99f7a 100644
--- a/Modules/FindOpenSSL.cmake
+++ b/Modules/FindOpenSSL.cmake
@@ -59,10 +59,6 @@ if (WIN32)
     "C:/OpenSSL-Win64/"
     )
   unset(_programfiles)
-  set(_OPENSSL_ROOT_HINTS_AND_PATHS
-    HINTS ${_OPENSSL_ROOT_HINTS}
-    PATHS ${_OPENSSL_ROOT_PATHS}
-    )
 else ()
   set(_OPENSSL_ROOT_HINTS
     ${OPENSSL_ROOT_DIR}
@@ -70,6 +66,11 @@ else ()
     )
 endif ()
 
+set(_OPENSSL_ROOT_HINTS_AND_PATHS
+    HINTS ${_OPENSSL_ROOT_HINTS}
+    PATHS ${_OPENSSL_ROOT_PATHS}
+    )
+
 find_path(OPENSSL_INCLUDE_DIR
   NAMES
     openssl/ssl.h

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

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


hooks/post-receive
-- 
CMake