romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-04-14 22:41:40 +03:00
Code Issues Projects Releases Packages Wiki Activity

TLS naming: fix more Winssl and Darwinssl leftovers

Browse source 
The CMake option is now called CMAKE_USE_SCHANNEL

The winbuild flag is USE_SCHANNEL

The CI jobs and build scripts only use the new names and the new name
options

Tests now require 'Schannel' (when necessary)

Closes #5795
This commit is contained in:
Daniel Stenberg 2020-08-07 17:11:52 +02:00
parent 265717d271
commit 2429f45a97
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
21 changed files with 91 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

24
appveyor.yml
View file

@ -30,7 +30,7 @@ environment:
PRJ_GEN: "Visual Studio 9 2008"
PRJ_CFG: Release
OPENSSL: OFF
WINSSL: ON
SCHANNEL: ON
HTTP_ONLY: OFF
TESTING: OFF
SHARED: ON
@ -42,7 +42,7 @@ environment:
TARGET: "-A x64"
PRJ_CFG: Release
OPENSSL: ON
WINSSL: OFF
SCHANNEL: OFF
HTTP_ONLY: OFF
TESTING: OFF
SHARED: ON
@ -54,7 +54,7 @@ environment:
TARGET: "-A ARM64"
PRJ_CFG: Release
OPENSSL: OFF
WINSSL: ON
SCHANNEL: ON
HTTP_ONLY: OFF
TESTING: OFF
SHARED: OFF
@ -66,7 +66,7 @@ environment:
PRJ_GEN: "Visual Studio 10 2010 Win64"
PRJ_CFG: Debug
OPENSSL: OFF
WINSSL: OFF
SCHANNEL: OFF
HTTP_ONLY: OFF
TESTING: ON
SHARED: OFF
@ -78,7 +78,7 @@ environment:
TARGET: "-A x64"
PRJ_CFG: Debug
OPENSSL: OFF
WINSSL: ON
SCHANNEL: ON
HTTP_ONLY: OFF
TESTING: ON
SHARED: OFF
@ -90,7 +90,7 @@ environment:
TARGET: "-A x64"
PRJ_CFG: Debug
OPENSSL: OFF
WINSSL: OFF
SCHANNEL: OFF
HTTP_ONLY: OFF
TESTING: ON
SHARED: OFF
@ -102,7 +102,7 @@ environment:
TARGET: "-A x64"
PRJ_CFG: Debug
OPENSSL: OFF
WINSSL: OFF
SCHANNEL: OFF
HTTP_ONLY: ON
TESTING: ON
SHARED: OFF
@ -114,7 +114,7 @@ environment:
PRJ_GEN: "MSYS Makefiles"
PRJ_CFG: Debug
OPENSSL: OFF
WINSSL: ON
SCHANNEL: ON
HTTP_ONLY: OFF
TESTING: ON
SHARED: OFF
@ -127,7 +127,7 @@ environment:
PRJ_GEN: "MSYS Makefiles"
PRJ_CFG: Debug
OPENSSL: OFF
WINSSL: ON
SCHANNEL: ON
HTTP_ONLY: OFF
TESTING: ON
SHARED: OFF
@ -140,7 +140,7 @@ environment:
PRJ_GEN: "MSYS Makefiles"
PRJ_CFG: Debug
OPENSSL: OFF
WINSSL: ON
SCHANNEL: ON
HTTP_ONLY: OFF
TESTING: ON
SHARED: OFF
@ -153,7 +153,7 @@ environment:
PRJ_GEN: "MSYS Makefiles"
PRJ_CFG: Debug
OPENSSL: OFF
WINSSL: OFF
SCHANNEL: OFF
HTTP_ONLY: OFF
TESTING: ON
SHARED: OFF
@ -244,7 +244,7 @@ build_script:
-G"%PRJ_GEN%"
%TARGET%
-DCMAKE_USE_OPENSSL=%OPENSSL%
-DCMAKE_USE_WINSSL=%WINSSL%
-DCMAKE_USE_SCHANNEL=%SCHANNEL%
-DHTTP_ONLY=%HTTP_ONLY%
-DBUILD_SHARED_LIBS=%SHARED%
-DBUILD_TESTING=%TESTING%