[Cmake-commits] CMake branch, next, updated. v3.1.0-1746-g2e97819

[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  2e978198af1bfa1f32849047bb7c792206fb5208 (commit)
       via  99b13820715ff3b98c2c0cb114b38620b6da4466 (commit)
      from  19ef10a664a003fb0bf12e575e021e15857c7bf4 (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=2e978198af1bfa1f32849047bb7c792206fb5208
commit 2e978198af1bfa1f32849047bb7c792206fb5208
Merge: 19ef10a 99b1382
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sun Jan 11 15:33:27 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jan 11 15:33:27 2015 -0500

    Merge topic 'FindOpenSSL-use-header-version' into next
    
    99b13820 FindOpenSSL: Always extract version from detected header (#15075)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=99b13820715ff3b98c2c0cb114b38620b6da4466
commit 99b13820715ff3b98c2c0cb114b38620b6da4466
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:32:55 2015 -0500

    FindOpenSSL: Always extract version from detected header (#15075)
    
    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:


hooks/post-receive
-- 
CMake