[Cmake-commits] CMake branch, master, updated. v3.12.3-854-g9df49ba

Kitware Robot kwrobot at kitware.com
Tue Oct 9 06:25:05 EDT 2018


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, master has been updated
       via  9df49ba020ebfa15571ce818631bed6043368c8e (commit)
       via  ab6bf9d0adc3de143599d5558a6475af3ba172eb (commit)
      from  0ab5db035ed47182fb8551f9872045eeae1f9cec (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=9df49ba020ebfa15571ce818631bed6043368c8e
commit 9df49ba020ebfa15571ce818631bed6043368c8e
Merge: 0ab5db0 ab6bf9d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 9 10:24:28 2018 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Oct 9 06:24:34 2018 -0400

    Merge topic 'update-prebuilt-openssl'
    
    ab6bf9d0ad Utilities/Release: Update to openssl-1.1.1
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !2461


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ab6bf9d0adc3de143599d5558a6475af3ba172eb
commit ab6bf9d0adc3de143599d5558a6475af3ba172eb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 8 10:42:12 2018 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 8 10:42:12 2018 -0400

    Utilities/Release: Update to openssl-1.1.1
    
    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/linux64_release.cmake b/Utilities/Release/linux64_release.cmake
index dc34120..fa585d7 100644
--- a/Utilities/Release/linux64_release.cmake
+++ b/Utilities/Release/linux64_release.cmake
@@ -29,9 +29,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:STRING=/home/kitware/openssl-1.1.0h/lib/libcrypto.a;-pthread
-OPENSSL_INCLUDE_DIR:PATH=/home/kitware/openssl-1.1.0h/include
-OPENSSL_SSL_LIBRARY:FILEPATH=/home/kitware/openssl-1.1.0h/lib/libssl.a
+OPENSSL_CRYPTO_LIBRARY:STRING=/home/kitware/openssl-1.1.1/lib/libcrypto.a;-pthread
+OPENSSL_INCLUDE_DIR:PATH=/home/kitware/openssl-1.1.1/include
+OPENSSL_SSL_LIBRARY:FILEPATH=/home/kitware/openssl-1.1.1/lib/libssl.a
 PYTHON_EXECUTABLE:FILEPATH=/usr/bin/python3
 CPACK_SYSTEM_NAME:STRING=Linux-x86_64
 BUILD_CursesDialog:BOOL=ON

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

Summary of changes:
 Utilities/Release/linux64_release.cmake | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list