[Cmake-commits] CMake branch, master, updated. v3.10.0-rc5-321-g47f8998
Kitware Robot
kwrobot at kitware.com
Wed Nov 15 08:45:11 EST 2017
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 47f8998d92ba637c67bd6eef63e7ab44224db074 (commit)
via b40d45cdb101a91fb2f7cc6fa8078337816aa92d (commit)
via 78aeb30075fc97c1171937a45a1816f1012d2ce4 (commit)
from 5c4482133100ff2b58063c60ce80b6595bb20cf5 (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=47f8998d92ba637c67bd6eef63e7ab44224db074
commit 47f8998d92ba637c67bd6eef63e7ab44224db074
Merge: 5c44821 b40d45c
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Nov 15 13:36:38 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Nov 15 08:37:04 2017 -0500
Merge topic 'update-prebuilt-openssl'
b40d45cd Utilities/Release: Update to openssl-1.1.0g
78aeb300 Utilities/Release: Update to openssl-1.0.2m
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1478
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b40d45cdb101a91fb2f7cc6fa8078337816aa92d
commit b40d45cdb101a91fb2f7cc6fa8078337816aa92d
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 14 09:43:03 2017 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Nov 14 09:43:03 2017 -0500
Utilities/Release: Update to openssl-1.1.0g
Update the prebuilt binary build configurations for machines where
we build our own OpenSSL library to use a newer version.
Now that we require pthreads for libuv anyway, we can use OpenSSL 1.1
along with its dependency on pthreads.
diff --git a/Utilities/Release/linux64_release.cmake b/Utilities/Release/linux64_release.cmake
index 052fd75..97fc33c 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.2m/lib/libcrypto.a
-OPENSSL_INCLUDE_DIR:PATH=/home/kitware/openssl-1.0.2m/include
-OPENSSL_SSL_LIBRARY:FILEPATH=/home/kitware/openssl-1.0.2m/lib/libssl.a
+OPENSSL_CRYPTO_LIBRARY:STRING=/home/kitware/openssl-1.1.0g/lib/libcrypto.a;-pthread
+OPENSSL_INCLUDE_DIR:PATH=/home/kitware/openssl-1.1.0g/include
+OPENSSL_SSL_LIBRARY:FILEPATH=/home/kitware/openssl-1.1.0g/lib/libssl.a
PYTHON_EXECUTABLE:FILEPATH=/usr/bin/python3
CPACK_SYSTEM_NAME:STRING=Linux-x86_64
BUILD_QtDialog:BOOL:=TRUE
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=78aeb30075fc97c1171937a45a1816f1012d2ce4
commit 78aeb30075fc97c1171937a45a1816f1012d2ce4
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 14 09:36:07 2017 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Nov 14 09:36:07 2017 -0500
Utilities/Release: Update to openssl-1.0.2m
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 e1aa3e7..052fd75 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.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
+OPENSSL_CRYPTO_LIBRARY:FILEPATH=/home/kitware/openssl-1.0.2m/lib/libcrypto.a
+OPENSSL_INCLUDE_DIR:PATH=/home/kitware/openssl-1.0.2m/include
+OPENSSL_SSL_LIBRARY:FILEPATH=/home/kitware/openssl-1.0.2m/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