[Cmake-commits] CMake branch, next, updated. v2.8.8-3588-g852998a

[Rolf Eike Beer]

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  852998a35b4e5b415a4015bb5f2d4e7188e8e2a3 (commit)
       via  fc798ed64fe4c67881653805720b846a0489d1b9 (commit)
      from  f751732d14939f276141ac8645638f628d04b93f (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=852998a35b4e5b415a4015bb5f2d4e7188e8e2a3
commit 852998a35b4e5b415a4015bb5f2d4e7188e8e2a3
Merge: f751732 fc798ed
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sun Jul 29 11:03:10 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jul 29 11:03:10 2012 -0400

    Merge topic 'FindOpenSSL-improve' into next
    
    fc798ed FindOpenSSL: cleanup path hints


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fc798ed64fe4c67881653805720b846a0489d1b9
commit fc798ed64fe4c67881653805720b846a0489d1b9
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sun Jul 29 17:02:00 2012 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sun Jul 29 17:02:00 2012 +0200

    FindOpenSSL: cleanup path hints
    
    -only use Windows-specific paths on Windows
    -recode the contents of $ENV{PROGRAMFILES} to be a valid CMake path before
     using it

diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
index 652ce05..fa5cfba 100644
--- a/Modules/FindOpenSSL.cmake
+++ b/Modules/FindOpenSSL.cmake
@@ -29,25 +29,34 @@ if (UNIX)
   pkg_check_modules(_OPENSSL QUIET openssl)
 endif (UNIX)
 
-# http://www.slproweb.com/products/Win32OpenSSL.html
-SET(_OPENSSL_ROOT_HINTS
-  ${OPENSSL_ROOT_DIR}
-  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]"
-  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (64-bit)_is1;Inno Setup: App Path]"
-  ENV OPENSSL_ROOT_DIR
-  )
-SET(_OPENSSL_ROOT_PATHS
-  "$ENV{PROGRAMFILES}/OpenSSL"
-  "$ENV{PROGRAMFILES}/OpenSSL-Win32"
-  "$ENV{PROGRAMFILES}/OpenSSL-Win64"
-  "C:/OpenSSL/"
-  "C:/OpenSSL-Win32/"
-  "C:/OpenSSL-Win64/"
-  )
-SET(_OPENSSL_ROOT_HINTS_AND_PATHS
-  HINTS ${_OPENSSL_ROOT_HINTS}
-  PATHS ${_OPENSSL_ROOT_PATHS}
-  )
+IF (WIN32)
+  # http://www.slproweb.com/products/Win32OpenSSL.html
+  SET(_OPENSSL_ROOT_HINTS
+    ${OPENSSL_ROOT_DIR}
+    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]"
+    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (64-bit)_is1;Inno Setup: App Path]"
+    ENV OPENSSL_ROOT_DIR
+    )
+  FILE(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _programfiles)
+  SET(_OPENSSL_ROOT_PATHS
+    "${_programfiles}/OpenSSL"
+    "${_programfiles}/OpenSSL-Win32"
+    "${_programfiles}/OpenSSL-Win64"
+    "C:/OpenSSL/"
+    "C:/OpenSSL-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}
+    ENV OPENSSL_ROOT_DIR
+    )
+ENDIF ()
 
 FIND_PATH(OPENSSL_INCLUDE_DIR
   NAMES

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

Summary of changes:
 Modules/FindOpenSSL.cmake |   47 ++++++++++++++++++++++++++------------------
 1 files changed, 28 insertions(+), 19 deletions(-)


hooks/post-receive
-- 
CMake