[Cmake-commits] CMake branch, next, updated. v3.5.2-1246-gcd4d618

[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  cd4d618661d84af9106e272e7674de50303b96cf (commit)
       via  3a67167ab0354bd1168c1158a474bbf26f80221f (commit)
       via  8d7ef6a8b02f2fca4ccb9aaad71ca0d2235ce8a6 (commit)
      from  2a8b9b54aa9a647d7fb6f5f135cc33c6241a25e4 (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=cd4d618661d84af9106e272e7674de50303b96cf
commit cd4d618661d84af9106e272e7674de50303b96cf
Merge: 2a8b9b5 3a67167
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu May 5 09:14:02 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu May 5 09:14:02 2016 -0400

    Merge topic 'update-prebuild-openssl' into next
    
    3a67167a Utilities/Release: Update to openssl-1.0.2h
    8d7ef6a8 CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3a67167ab0354bd1168c1158a474bbf26f80221f
commit 3a67167ab0354bd1168c1158a474bbf26f80221f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu May 5 09:13:33 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu May 5 09:13:33 2016 -0400

    Utilities/Release: Update to openssl-1.0.2h
    
    Update the prebuilt binary build configurations for machines where
    we build our own OpenSSL library to use a newer version.

diff --git a/Utilities/Release/linux32_release.cmake b/Utilities/Release/linux32_release.cmake
index 00abcc1..6d096d1 100644
--- a/Utilities/Release/linux32_release.cmake
+++ b/Utilities/Release/linux32_release.cmake
@@ -12,9 +12,9 @@ CURSES_LIBRARY:FILEPATH=/usr/i686-gcc-332s/lib/libncurses.a
 CURSES_INCLUDE_PATH:PATH=/usr/i686-gcc-332s/include/ncurses
 FORM_LIBRARY:FILEPATH=/usr/i686-gcc-332s/lib/libform.a
 CMAKE_USE_OPENSSL:BOOL=ON
-OPENSSL_CRYPTO_LIBRARY:FILEPATH=/home/kitware/openssl-1.0.2f/lib/libcrypto.a
-OPENSSL_INCLUDE_DIR:PATH=/home/kitware/openssl-1.0.2f/include
-OPENSSL_SSL_LIBRARY:FILEPATH=/home/kitware/openssl-1.0.2f/lib/libssl.a
+OPENSSL_CRYPTO_LIBRARY:FILEPATH=/home/kitware/openssl-1.0.2h/lib/libcrypto.a
+OPENSSL_INCLUDE_DIR:PATH=/home/kitware/openssl-1.0.2h/include
+OPENSSL_SSL_LIBRARY:FILEPATH=/home/kitware/openssl-1.0.2h/lib/libssl.a
 CPACK_SYSTEM_NAME:STRING=Linux-i386
 BUILD_QtDialog:BOOL:=TRUE
 CMake_GUI_DISTRIBUTE_WITH_Qt_LGPL:BOOL=TRUE
diff --git a/Utilities/Release/linux64_release.cmake b/Utilities/Release/linux64_release.cmake
index 4787d69..cfe370b 100644
--- a/Utilities/Release/linux64_release.cmake
+++ b/Utilities/Release/linux64_release.cmake
@@ -12,9 +12,9 @@ CURSES_LIBRARY:FILEPATH=/home/kitware/ncurses-5.9/lib/libncurses.a
 CURSES_INCLUDE_PATH:PATH=/home/kitware/ncurses-5.9/include
 FORM_LIBRARY:FILEPATH=/home/kitware/ncurses-5.9/lib/libform.a
 CMAKE_USE_OPENSSL:BOOL=ON
-OPENSSL_CRYPTO_LIBRARY:FILEPATH=/home/kitware/openssl-1.0.2f/lib/libcrypto.a
-OPENSSL_INCLUDE_DIR:PATH=/home/kitware/openssl-1.0.2f/include
-OPENSSL_SSL_LIBRARY:FILEPATH=/home/kitware/openssl-1.0.2f/lib/libssl.a
+OPENSSL_CRYPTO_LIBRARY:FILEPATH=/home/kitware/openssl-1.0.2h/lib/libcrypto.a
+OPENSSL_INCLUDE_DIR:PATH=/home/kitware/openssl-1.0.2h/include
+OPENSSL_SSL_LIBRARY:FILEPATH=/home/kitware/openssl-1.0.2h/lib/libssl.a
 CPACK_SYSTEM_NAME:STRING=Linux-x86_64
 BUILD_QtDialog:BOOL:=TRUE
 CMake_GUI_DISTRIBUTE_WITH_Qt_LGPL:BOOL=TRUE

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

Summary of changes:
 Source/CMakeVersion.cmake               |    2 +-
 Utilities/Release/linux32_release.cmake |    6 +++---
 Utilities/Release/linux64_release.cmake |    6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake