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 d7b1a40b0f039ed46522d5c9f3c7c421833ba32c (commit)
via 2f07b2c4ec7f60071b9e42bf2de909eb2529eac1 (commit)
from dd764e11ffcb065779e6ca84e6ffa8435db7f681 (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=d7b1a40b0f039ed46522d5c9f3c7c421833ba32c
commit d7b1a40b0f039ed46522d5c9f3c7c421833ba32c
Merge: dd764e1 2f07b2c
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Feb 26 14:34:01 2016 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Feb 26 14:34:01 2016 -0500
Merge topic 'enable-ssl-automatically' into next
2f07b2c4 Automatically use OpenSSL by default on UNIX if it is available
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2f07b2c4ec7f60071b9e42bf2de909eb2529eac1
commit 2f07b2c4ec7f60071b9e42bf2de909eb2529eac1
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Feb 26 14:19:51 2016 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Fri Feb 26 14:30:13 2016 -0500
Automatically use OpenSSL by default on UNIX if it is available
Since https is almost ubiquitous nowadays we should support it by
default whenever possible. When building our own curl, we already
automatically enable SSL/TLS support on Windows and OS X by using the
OS-native APIs. On UNIX platforms we need to use OpenSSL but have not
done so by default before, leading to possible user confusion when https
transfers fail later. Fix this by searching for OpenSSL quietly and
enabling use of it automatically if it is found.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9381f35..e4c4081 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -327,7 +327,14 @@ macro (CMAKE_BUILD_UTILITIES)
if(CMAKE_TESTS_CDASH_SERVER)
set(CMAKE_CURL_TEST_URL "${CMAKE_TESTS_CDASH_SERVER}/user.php")
endif()
- option(CMAKE_USE_OPENSSL "Use OpenSSL." OFF)
+ set(_CMAKE_USE_OPENSSL_DEFAULT OFF)
+ if(NOT DEFINED CMAKE_USE_OPENSSL AND NOT WIN32 AND NOT APPLE)
+ find_package(OpenSSL QUIET)
+ if(OPENSSL_FOUND)
+ set(_CMAKE_USE_OPENSSL_DEFAULT ON)
+ endif()
+ endif()
+ option(CMAKE_USE_OPENSSL "Use OpenSSL." ${_CMAKE_USE_OPENSSL_DEFAULT})
mark_as_advanced(CMAKE_USE_OPENSSL)
if(CMAKE_USE_OPENSSL)
set(CURL_CA_BUNDLE "" CACHE FILEPATH "Path to SSL CA Certificate Bundle")
diff --git a/Help/release/dev/enable-ssl-automatically.rst
b/Help/release/dev/enable-ssl-automatically.rst
new file mode 100644
index 0000000..32726b4
--- /dev/null
+++ b/Help/release/dev/enable-ssl-automatically.rst
@@ -0,0 +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)`,
+ :command:`file(UPLOAD)`, and :command:`ctest_submit`.
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 9 ++++++++-
Help/release/dev/enable-ssl-automatically.rst | 8 ++++++++
2 files changed, 16 insertions(+), 1 deletion(-)
create mode 100644 Help/release/dev/enable-ssl-automatically.rst
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
