[Cmake-commits] CMake branch, next, updated. v3.6.0-rc1-156-gca701b2

[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  ca701b2c12979cf70f7f824d93e735c8d78a564f (commit)
       via  e937b4c3879e1ee0770b465c0cdcbb6a960ba892 (commit)
       via  39699947589e96b59d7f56d9c0b1dcb1bef27f8a (commit)
      from  7c99e0fa021fcade3968d3ab75fb0bff5b04d809 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ca701b2c12979cf70f7f824d93e735c8d78a564f
commit ca701b2c12979cf70f7f824d93e735c8d78a564f
Merge: 7c99e0f e937b4c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 9 08:53:04 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 9 08:53:04 2016 -0400

    Merge topic 'FindOpenSSL-BoringSSL' into next
    
    e937b4c3 FindOpenSSL: Do not assume that the version regex finds something
    39699947 CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e937b4c3879e1ee0770b465c0cdcbb6a960ba892
commit e937b4c3879e1ee0770b465c0cdcbb6a960ba892
Author:     Vladimír Vondruš <mosra at centrum.cz>
AuthorDate: Thu Jun 9 14:03:47 2016 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jun 9 08:51:01 2016 -0400

    FindOpenSSL: Do not assume that the version regex finds something
    
    BoringSSL's openslv.h does not have the version information.

diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
index 8dbaf11..6393f2e 100644
--- a/Modules/FindOpenSSL.cmake
+++ b/Modules/FindOpenSSL.cmake
@@ -328,11 +328,11 @@ function(from_hex HEX DEC)
   set(${DEC} ${_res} PARENT_SCOPE)
 endfunction()
 
-if (OPENSSL_INCLUDE_DIR)
-  if(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h")
-    file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" openssl_version_str
-         REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*")
+if(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h")
+  file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" openssl_version_str
+       REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*")
 
+  if(openssl_version_str)
     # 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.
     # Major, minor, and fix directly translate into the version numbers shown in

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

Summary of changes:
 Modules/FindOpenSSL.cmake |    8 ++++----
 Source/CMakeVersion.cmake |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake