[Cmake-commits] CMake branch, next, updated. v2.8.7-2125-g133dceb

[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  133dceb1aea03c2e5647271d9c3d94dafe5c72ea (commit)
       via  bb2b264b5ed76428319a428949a54ba76f71004d (commit)
      from  61d41e513cdc82162553680c9d4801537320e0d7 (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=133dceb1aea03c2e5647271d9c3d94dafe5c72ea
commit 133dceb1aea03c2e5647271d9c3d94dafe5c72ea
Merge: 61d41e5 bb2b264
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Jan 17 13:07:52 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 17 13:07:52 2012 -0500

    Merge topic 'openssl-version' into next
    
    bb2b264 FindOpenSSL: also parse version number define with uppercase letters


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bb2b264b5ed76428319a428949a54ba76f71004d
commit bb2b264b5ed76428319a428949a54ba76f71004d
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Jan 17 19:02:31 2012 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Tue Jan 17 19:07:04 2012 +0100

    FindOpenSSL: also parse version number define with uppercase letters

diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
index 5505282..0750592 100644
--- a/Modules/FindOpenSSL.cmake
+++ b/Modules/FindOpenSSL.cmake
@@ -220,7 +220,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-9][0-9][0-9][0-9][0-9][0-9].*")
+         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.
@@ -229,7 +229,7 @@ if (OPENSSL_INCLUDE_DIR)
     # indicates the bug fix state, which 00 -> nothing, 01 -> a, 02 -> b and so
     # on.
 
-    string(REGEX REPLACE "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-f])([0-9a-f][0-9a-f])([0-9a-f][0-9a-f])([0-9a-f][0-9a-f])([0-9a-f]).*$"
+    string(REGEX REPLACE "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F]).*$"
            "\\1;\\2;\\3;\\4;\\5" OPENSSL_VERSION_LIST "${openssl_version_str}")
     list(GET OPENSSL_VERSION_LIST 0 OPENSSL_VERSION_MAJOR)
     list(GET OPENSSL_VERSION_LIST 1 OPENSSL_VERSION_MINOR)

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

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


hooks/post-receive
-- 
CMake