diff options
| author | Brad King <brad.king@kitware.com> | 2014-12-15 16:06:47 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-12-15 16:06:47 (GMT) |
| commit | 526c34b240638bea90cce4162a95f0c8c7ea8a88 (patch) | |
| tree | bdd0009b06389e87378b6869863191eae7b0bb7e | |
| parent | 6da3f173093ed5b6b2b1944c9c561fcd62d07eee (diff) | |
| parent | ba8c6632194256a6a3370713d8e0423ad516361a (diff) | |
| download | CMake-526c34b240638bea90cce4162a95f0c8c7ea8a88.zip CMake-526c34b240638bea90cce4162a95f0c8c7ea8a88.tar.gz CMake-526c34b240638bea90cce4162a95f0c8c7ea8a88.tar.bz2 | |
Merge topic 'curl-winssl'
ba8c6632 curl: Use Windows SSL/TLS native implementation
| -rw-r--r-- | Help/release/dev/curl-winssl.rst | 9 | ||||
| -rw-r--r-- | Utilities/cmcurl/CMakeLists.txt | 6 |
2 files changed, 14 insertions, 1 deletions
diff --git a/Help/release/dev/curl-winssl.rst b/Help/release/dev/curl-winssl.rst new file mode 100644 index 0000000..9a28f4f --- /dev/null +++ b/Help/release/dev/curl-winssl.rst @@ -0,0 +1,9 @@ +curl-winssl +----------- + +* On Windows, commands supporting network communication, such as + :command:`file(DOWNLOAD)`, :command:`file(UPLOAD)`, and + :command:`ctest_submit`, now support SSL/TLS even when CMake + is not built against OpenSSL. The Windows native SSL/TLS + implementation is used by default. OS-configured certificate + authorities will be trusted automatically. diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt index eaf276b..1092e48 100644 --- a/Utilities/cmcurl/CMakeLists.txt +++ b/Utilities/cmcurl/CMakeLists.txt @@ -460,7 +460,11 @@ if(CMAKE_USE_OPENSSL) add_definitions(-DCURL_CA_BUNDLE="${CURL_CA_BUNDLE}") endif() endif(OPENSSL_FOUND) -endif(CMAKE_USE_OPENSSL) +elseif(WIN32) + # Use Windows SSL/TLS native implementation. + add_definitions(-DUSE_SCHANNEL) + set(USE_WINDOWS_SSPI 1) +endif() #libSSH2 option(CMAKE_USE_LIBSSH2 "Use libSSH2" ON) |