[Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-309-gb5f27e7
Brad King
brad.king at kitware.com
Mon Feb 29 11:50:28 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 b5f27e7d852f5f64bfca2d7c6e1d068696d4372a (commit)
via 995162da6266d139e42b3db819a7c85386f22d7a (commit)
from 67e7b4843d0df72f6b50278970352c42852ead17 (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=b5f27e7d852f5f64bfca2d7c6e1d068696d4372a
commit b5f27e7d852f5f64bfca2d7c6e1d068696d4372a
Merge: 67e7b48 995162d
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 29 11:50:27 2016 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 29 11:50:27 2016 -0500
Merge topic 'enable-ssl-automatically' into next
995162da fixup! Automatically use OpenSSL by default on UNIX if it is available
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=995162da6266d139e42b3db819a7c85386f22d7a
commit 995162da6266d139e42b3db819a7c85386f22d7a
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 29 11:50:09 2016 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 29 11:50:09 2016 -0500
fixup! Automatically use OpenSSL by default on UNIX if it is available
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e4c4081..787f319 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -328,7 +328,8 @@ macro (CMAKE_BUILD_UTILITIES)
set(CMAKE_CURL_TEST_URL "${CMAKE_TESTS_CDASH_SERVER}/user.php")
endif()
set(_CMAKE_USE_OPENSSL_DEFAULT OFF)
- if(NOT DEFINED CMAKE_USE_OPENSSL AND NOT WIN32 AND NOT APPLE)
+ if(NOT DEFINED CMAKE_USE_OPENSSL AND NOT WIN32 AND NOT APPLE
+ AND CMAKE_SYSTEM_NAME MATCHES "(Linux|FreeBSD)")
find_package(OpenSSL QUIET)
if(OPENSSL_FOUND)
set(_CMAKE_USE_OPENSSL_DEFAULT ON)
diff --git a/Help/release/dev/enable-ssl-automatically.rst b/Help/release/dev/enable-ssl-automatically.rst
index 32726b4..8ded656 100644
--- a/Help/release/dev/enable-ssl-automatically.rst
+++ b/Help/release/dev/enable-ssl-automatically.rst
@@ -1,8 +1,8 @@
enable-ssl-automatically
------------------------
-* On UNIX platforms, when building CMake itself from source and not using a
- system-provided libcurl, OpenSSL is now used by default if it is found on
- the system. This enables SSL/TLS support for commands supporting network
- communication via ``https``, such as :command:`file(DOWNLOAD)`,
+* On Linux and FreeBSD platforms, when building CMake itself from source and
+ not using a system-provided libcurl, OpenSSL is now used by default if it is
+ found on the system. This enables SSL/TLS support for commands supporting
+ network communication via ``https``, such as :command:`file(DOWNLOAD)`,
:command:`file(UPLOAD)`, and :command:`ctest_submit`.
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 3 ++-
Help/release/dev/enable-ssl-automatically.rst | 8 ++++----
2 files changed, 6 insertions(+), 5 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list