[Cmake-commits] CMake branch, next, updated. v2.8.7-2120-g22340e0

Rolf Eike Beer eike at sf-mail.de
Tue Jan 17 02:37:22 EST 2012


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  22340e07b80c51685f24ccf745445abf1b2989d1 (commit)
       via  7053a00f237c5d510a9a64566139b76ce82dffdc (commit)
       via  44ba7a3da8682316c8a53a266e06edceb038ef4d (commit)
       via  795221775a2c34dc7b8f49e6af9b29317963e176 (commit)
       via  038ba372fab6f4fcc47f5a6799b642a04288a1f5 (commit)
       via  9188dafac15348d70bf90658d89adcd0e2b4cca2 (commit)
       via  c121f3f5c4b874910ab8e5b083827d9e393e1a96 (commit)
      from  744eac4bae87f52a2861e5494bd3f12b2d225a6d (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=22340e07b80c51685f24ccf745445abf1b2989d1
commit 22340e07b80c51685f24ccf745445abf1b2989d1
Merge: 744eac4 7053a00
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Jan 17 02:37:19 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 17 02:37:19 2012 -0500

    Merge topic 'openssl-version' into next
    
    7053a00 FindOpenSSL: only try to parse opensslv.h if it exists
    44ba7a3 Merge branch 'master' of git://cmake.org/cmake into openssl-version
    7952217 KWSys Nightly Date Stamp
    038ba37 KWSys Nightly Date Stamp
    9188daf KWSys Nightly Date Stamp
    c121f3f KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7053a00f237c5d510a9a64566139b76ce82dffdc
commit 7053a00f237c5d510a9a64566139b76ce82dffdc
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Jan 17 08:36:50 2012 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Tue Jan 17 08:36:50 2012 +0100

    FindOpenSSL: only try to parse opensslv.h if it exists

diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
index bff5af6..5505282 100644
--- a/Modules/FindOpenSSL.cmake
+++ b/Modules/FindOpenSSL.cmake
@@ -218,7 +218,7 @@ ENDIF(WIN32 AND NOT CYGWIN)
 if (OPENSSL_INCLUDE_DIR)
   if (_OPENSSL_VERSION)
     set(OPENSSL_VERSION "${_OPENSSL_VERSION}")
-  else (_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].*")
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=44ba7a3da8682316c8a53a266e06edceb038ef4d
commit 44ba7a3da8682316c8a53a266e06edceb038ef4d
Merge: 8e8672c 7952217
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Jan 17 08:25:45 2012 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Tue Jan 17 08:25:45 2012 +0100

    Merge branch 'master' of git://cmake.org/cmake into openssl-version


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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list