[qtbase] fix windows with dnslookup feature (#40189)

This commit is contained in:
Sebastian Goth 2024-08-01 19:10:00 +02:00 committed by GitHub
parent eff777a963
commit fb9f1dcb38
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 11 additions and 3 deletions

View File

@ -138,7 +138,6 @@ list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_WrapBacktrace:BOOL
"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
@ -153,6 +152,10 @@ else()
list(APPEND FEATURE_NET_OPTIONS -DINPUT_openssl=no)
endif()
if ("dnslookup" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_WINDOWS)
list(APPEND FEATURE_NET_OPTIONS -DFEATURE_libresolv:BOOL=ON)
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)

View File

@ -1,7 +1,7 @@
{
"name": "qtbase",
"version": "6.7.2",
"port-version": 1,
"port-version": 2,
"description": "Qt Base (Core, Gui, Widgets, Network, ...)",
"homepage": "https://www.qt.io/",
"license": null,

View File

@ -7414,7 +7414,7 @@
},
"qtbase": {
"baseline": "6.7.2",
"port-version": 1
"port-version": 2
},
"qtcharts": {
"baseline": "6.7.2",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "4ab85d9411b4c85c89976e768f158dd0631b442d",
"version": "6.7.2",
"port-version": 2
},
{
"git-tree": "b8c493a18ed293e1418f464515c9f9ddf3dc1bfe",
"version": "6.7.2",