[Cmake-commits] CMake branch, master, updated. v3.1.1-946-gde4ccee

[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, master has been updated
       via  de4ccee75a89519f95fcbcca75abc46577bfefea (commit)
       via  c5d9a8283cfac15b4a5a07f18d5eb10c1f388505 (commit)
      from  b7d7b306541a8ff1a7e8384f5c44baabec3ec94d (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=de4ccee75a89519f95fcbcca75abc46577bfefea
commit de4ccee75a89519f95fcbcca75abc46577bfefea
Merge: b7d7b30 c5d9a82
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 28 09:33:42 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 28 09:33:42 2015 -0500

    Merge topic 'OpenSSL_102'
    
    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.

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

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


hooks/post-receive
-- 
CMake