mirror of https://github.com/microsoft/vcpkg.git
[qtbase] dnslookup feature flag and support for QDnsLookup on !Windows (#40004)
This commit is contained in:
parent
cef7db8009
commit
f0c427c5de
|
|
@ -137,11 +137,14 @@ list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_WrapBacktrace:BOOL
|
|||
"openssl" FEATURE_openssl
|
||||
"brotli" FEATURE_brotli
|
||||
"securetransport" FEATURE_securetransport
|
||||
"dnslookup" FEATURE_dnslookup
|
||||
"dnslookup" FEATURE_libresolv
|
||||
#"brotli" CMAKE_REQUIRE_FIND_PACKAGE_WrapBrotli
|
||||
#"openssl" CMAKE_REQUIRE_FIND_PACKAGE_WrapOpenSSL
|
||||
INVERTED_FEATURES
|
||||
"brotli" CMAKE_DISABLE_FIND_PACKAGE_WrapBrotli
|
||||
"openssl" CMAKE_DISABLE_FIND_PACKAGE_WrapOpenSSL
|
||||
"dnslookup" CMAKE_DISABLE_FIND_PACKAGE_WrapResolve
|
||||
)
|
||||
|
||||
if("openssl" IN_LIST FEATURES)
|
||||
|
|
@ -152,7 +155,6 @@ endif()
|
|||
|
||||
list(APPEND FEATURE_NET_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Libproxy:BOOL=ON)
|
||||
list(APPEND FEATURE_NET_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_GSSAPI:BOOL=ON)
|
||||
list(APPEND FEATURE_NET_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_WrapResolv:BOOL=ON)
|
||||
|
||||
# Gui features:
|
||||
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_GUI_OPTIONS
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
"name": "qtbase",
|
||||
"version": "6.7.2",
|
||||
"port-version": 1,
|
||||
"description": "Qt Base (Core, Gui, Widgets, Network, ...)",
|
||||
"homepage": "https://www.qt.io/",
|
||||
"license": null,
|
||||
|
|
@ -65,6 +66,7 @@
|
|||
"platform": "!(static & windows)"
|
||||
},
|
||||
"default-features",
|
||||
"dnslookup",
|
||||
"doubleconversion",
|
||||
"freetype",
|
||||
"gui",
|
||||
|
|
@ -185,6 +187,18 @@
|
|||
}
|
||||
]
|
||||
},
|
||||
"dnslookup": {
|
||||
"description": "Enable DNS lookup support",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "qtbase",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"network"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"doubleconversion": {
|
||||
"description": "Enable double conversion support",
|
||||
"dependencies": [
|
||||
|
|
|
|||
|
|
@ -7410,7 +7410,7 @@
|
|||
},
|
||||
"qtbase": {
|
||||
"baseline": "6.7.2",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"qtcharts": {
|
||||
"baseline": "6.7.2",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "b8c493a18ed293e1418f464515c9f9ddf3dc1bfe",
|
||||
"version": "6.7.2",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "f8600119a4cecb137dd044bf72ab5a3c8b67ae02",
|
||||
"version": "6.7.2",
|
||||
|
|
|
|||
Loading…
Reference in New Issue