mirror of
https://github.com/microsoft/vcpkg
synced 2024-11-21 16:09:03 -07:00
[curl] wolfssl and openssl features can install alongside (#42104)
This commit is contained in:
parent
2f789860b7
commit
91e3894986
5 changed files with 9 additions and 10 deletions
|
@ -44,14 +44,6 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
|||
websockets CURL_DISABLE_WEBSOCKETS
|
||||
)
|
||||
|
||||
# Add warning on build failuer when using wolfssl and openssl features togther.
|
||||
if("openssl" IN_LIST FEATURES AND "wolfssl" IN_LIST FEATURES)
|
||||
message(WARNING "Adding OpenSSL and WolfSSL simultaneously will result in a build failure. \
|
||||
Please remove one of these features from your build process.\
|
||||
If you are using OpenSSL version 1.1, you may disregard this warning."
|
||||
)
|
||||
endif()
|
||||
|
||||
set(OPTIONS "")
|
||||
|
||||
if("sectransp" IN_LIST FEATURES)
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
"name": "curl",
|
||||
"version": "8.11.0",
|
||||
"port-version": 1,
|
||||
"description": "A library for transferring data with URLs",
|
||||
"homepage": "https://curl.se/",
|
||||
"license": "curl AND ISC AND BSD-3-Clause",
|
||||
|
|
|
@ -33,7 +33,8 @@
|
|||
"gsasl",
|
||||
"mbedtls",
|
||||
"openssl",
|
||||
"psl"
|
||||
"psl",
|
||||
"wolfssl"
|
||||
],
|
||||
"platform": "!uwp"
|
||||
},
|
||||
|
|
|
@ -2142,7 +2142,7 @@
|
|||
},
|
||||
"curl": {
|
||||
"baseline": "8.11.0",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"curlcpp": {
|
||||
"baseline": "3.1",
|
||||
|
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "6ef1763f3cbe570d6378632c9b5793479c37fb07",
|
||||
"version": "8.11.0",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "c7272ca5021fc2b6a404911e1c0055fa08992463",
|
||||
"version": "8.11.0",
|
||||
|
|
Loading…
Reference in a new issue