kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'curl-winssl' 

ba8c6632 curl: Use Windows SSL/TLS native implementation
This commit is contained in:
Brad King 2014-12-15 11:06:47 -05:00 committed by CMake Topic Stage
parent 6da3f17309 ba8c663219
commit 526c34b240
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Help/release/dev/curl-winssl.rst Normal file
View File

@ -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.

6
Utilities/cmcurl/CMakeLists.txt
View File

@ -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)