[Cmake-commits] CMake branch, next, updated. v3.7.0-1245-g077c70d
Brad King
brad.king at kitware.com
Thu Nov 17 16:13:11 EST 2016
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 077c70d310c18d7f93ca926e166316d645d30e7e (commit)
via 2dafeacb75e54cfe6c5dc17f253ebdcc61a99e47 (commit)
from f31f22974fb00b2a63998947117ce7170afebbd6 (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=077c70d310c18d7f93ca926e166316d645d30e7e
commit 077c70d310c18d7f93ca926e166316d645d30e7e
Merge: f31f229 2dafeac
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 17 16:13:11 2016 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 17 16:13:11 2016 -0500
Merge topic 'update-prebuilt-openssl' into next
2dafeacb Utilities/Release: Update to openssl-1.0.2j
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2dafeacb75e54cfe6c5dc17f253ebdcc61a99e47
commit 2dafeacb75e54cfe6c5dc17f253ebdcc61a99e47
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 17 16:12:36 2016 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Nov 17 16:12:36 2016 -0500
Utilities/Release: Update to openssl-1.0.2j
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 b9447ca..feba2a5 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: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
+OPENSSL_CRYPTO_LIBRARY:FILEPATH=/home/kitware/openssl-1.0.2j/lib/libcrypto.a
+OPENSSL_INCLUDE_DIR:PATH=/home/kitware/openssl-1.0.2j/include
+OPENSSL_SSL_LIBRARY:FILEPATH=/home/kitware/openssl-1.0.2j/lib/libssl.a
PYTHON_EXECUTABLE:FILEPATH=/usr/bin/python3
CPACK_SYSTEM_NAME:STRING=Linux-x86_64
BUILD_QtDialog:BOOL:=TRUE
-----------------------------------------------------------------------
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