[ixwebsocket] use support expression an cleanup (#33340)

This commit is contained in:
autoantwort 2023-08-25 21:28:55 +02:00 committed by GitHub
parent e7b95189fa
commit 147d18663c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 10 deletions

View File

@ -16,17 +16,23 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
sectransp USE_SECURE_TRANSPORT
)
if("sectransp" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_OSX)
message(FATAL_ERROR "sectransp is not supported on non-Apple platforms")
string(COMPARE NOTEQUAL "${FEATURES}" "core" USE_TLS)
list(REMOVE_ITEM FEATURES "ssl")
list(LENGTH FEATURES num_features)
if(num_features GREATER "2")
message(FATAL_ERROR "Can not select multiple ssl backends at the same time. Disable default features to disable the default ssl backend.")
endif()
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
${FEATURE_OPTIONS}
-DUSE_TLS=1
-DUSE_TLS=${USE_TLS}
MAYBE_UNUSED_VARIABLES
USE_SECURE_TRANSPORT
USE_MBED_TLS
USE_OPEN_SSL
)
vcpkg_cmake_install()

View File

@ -1,6 +1,7 @@
{
"name": "ixwebsocket",
"version-semver": "11.4.4",
"port-version": 1,
"description": "Lightweight WebSocket Client and Server + HTTP Client and Server",
"homepage": "https://github.com/machinezone/IXWebSocket",
"license": "BSD-3-Clause",
@ -32,7 +33,8 @@
]
},
"sectransp": {
"description": "SSL support (sectransp)"
"description": "SSL support (sectransp)",
"supports": "osx | ios"
},
"ssl": {
"description": "Default SSL backend",
@ -40,16 +42,16 @@
{
"name": "ixwebsocket",
"features": [
"sectransp"
"mbedtls"
],
"platform": "osx"
"platform": "windows"
},
{
"name": "ixwebsocket",
"features": [
"mbedtls"
"sectransp"
],
"platform": "windows"
"platform": "osx | ios"
},
{
"name": "ixwebsocket",
@ -63,7 +65,7 @@
"features": [
"openssl"
],
"platform": "!uwp & !windows & !osx"
"platform": "!uwp & !windows & !osx & !ios"
}
]
}

View File

@ -3474,7 +3474,7 @@
},
"ixwebsocket": {
"baseline": "11.4.4",
"port-version": 0
"port-version": 1
},
"jack2": {
"baseline": "1.9.21",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5b7a553c76d49514bc70203959be6b7bd4981090",
"version-semver": "11.4.4",
"port-version": 1
},
{
"git-tree": "8831fc46f1465a5630978a28255c9edab0fed860",
"version-semver": "11.4.4",