[Cmake-commits] CMake branch, next, updated. v3.1.1-2406-g27da8cf

[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  27da8cf2d3ddf34acd9eeccf630d83ccbf89cd38 (commit)
       via  c5d9a8283cfac15b4a5a07f18d5eb10c1f388505 (commit)
      from  081c724ccb82ed1bae3f629f4b6f0b3afc79fdfc (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=27da8cf2d3ddf34acd9eeccf630d83ccbf89cd38
commit 27da8cf2d3ddf34acd9eeccf630d83ccbf89cd38
Merge: 081c724 c5d9a82
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Jan 27 16:55:07 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 27 16:55:07 2015 -0500

    Merge topic 'OpenSSL_102' into next
    
    c5d9a828 FindOpenSSL: fix detection of OpenSSL 1.0.2

diff --cc Modules/FindOpenSSL.cmake
index bfbe01f,6b4f985..3adc269
--- a/Modules/FindOpenSSL.cmake
+++ b/Modules/FindOpenSSL.cmake
@@@ -283,9 -275,11 +283,9 @@@ function(from_hex HEX DEC
  endfunction()
  
  if (OPENSSL_INCLUDE_DIR)
 -  if (_OPENSSL_VERSION)
 -    set(OPENSSL_VERSION "${_OPENSSL_VERSION}")
 -  elseif(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h")
 +  if(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h")
      file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" openssl_version_str
-          REGEX "^#define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*")
+          REGEX "^# *define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*")
  
      # The version number is encoded as 0xMNNFFPPS: major minor fix patch status
      # The status gives if this is a developer or prerelease and is ignored here.

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c5d9a8283cfac15b4a5a07f18d5eb10c1f388505
commit c5d9a8283cfac15b4a5a07f18d5eb10c1f388505
Author:     Guillaume Belz <guillaume.belz at gmail.com>
AuthorDate: Tue Jan 27 22:53:54 2015 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Tue Jan 27 22:53:54 2015 +0100

    FindOpenSSL: fix detection of OpenSSL 1.0.2

diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
index 340b417..6b4f985 100644
--- a/Modules/FindOpenSSL.cmake
+++ b/Modules/FindOpenSSL.cmake
@@ -279,7 +279,7 @@ if (OPENSSL_INCLUDE_DIR)
     set(OPENSSL_VERSION "${_OPENSSL_VERSION}")
   elseif(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h")
     file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" openssl_version_str
-         REGEX "^#define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*")
+         REGEX "^# *define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*")
 
     # The version number is encoded as 0xMNNFFPPS: major minor fix patch status
     # The status gives if this is a developer or prerelease and is ignored here.

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

Summary of changes:
 Modules/FindOpenSSL.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake