[Cmake-commits] CMake branch, next, updated. v3.1.0-1744-g19ef10a

[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  19ef10a664a003fb0bf12e575e021e15857c7bf4 (commit)
       via  69f0b6d21e6028fe7d176cf22702a90883aeaf15 (commit)
      from  1756828f2df84e72da330848896d3e877810093f (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=19ef10a664a003fb0bf12e575e021e15857c7bf4
commit 19ef10a664a003fb0bf12e575e021e15857c7bf4
Merge: 1756828 69f0b6d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sun Jan 11 15:28:42 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jan 11 15:28:42 2015 -0500

    Merge topic 'FindOpenSSL-use-header-version' into next
    
    69f0b6d2 FindOpenSSL: Always extract version from detected header


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=69f0b6d21e6028fe7d176cf22702a90883aeaf15
commit 69f0b6d21e6028fe7d176cf22702a90883aeaf15
Author:     Aku Kotkavuo <aku.kotkavuo at gmail.com>
AuthorDate: Sat Jan 10 00:40:20 2015 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sun Jan 11 15:27:25 2015 -0500

    FindOpenSSL: Always extract version from detected header
    
    Do not use the _OPENSSL_VERSION computed by pkg-config because
    the user may change OPENSSL_INCLUDE_DIR.

diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
index b2722a6..bfbe01f 100644
--- a/Modules/FindOpenSSL.cmake
+++ b/Modules/FindOpenSSL.cmake
@@ -283,9 +283,7 @@ 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])+.*")
 

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

Summary of changes:
 Modules/FindOpenSSL.cmake |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)


hooks/post-receive
-- 
CMake