Fix wxWidgets webview feature for macOS and Linux cross-platform support (#49233)

Co-authored-by: Victor Romero <romerosanchezv@gmail.com>
This commit is contained in:
Richard Powell
2026-01-07 19:25:12 +01:00
committed by GitHub
parent bd4807ea7c
commit 099601cb50
6 changed files with 19 additions and 7 deletions

View File

@@ -40,9 +40,13 @@ vcpkg_check_features(
secretstore wxUSE_SECRETSTORE
sound wxUSE_SOUND
webview wxUSE_WEBVIEW
webview wxUSE_WEBVIEW_EDGE
)
# Only use wxUSE_WEBVIEW_EDGE on Windows (webview2)
if(VCPKG_TARGET_IS_WINDOWS AND "webview" IN_LIST FEATURES)
list(APPEND FEATURE_OPTIONS "-DwxUSE_WEBVIEW_EDGE=ON")
endif()
set(OPTIONS_RELEASE "")
if(NOT "debug-support" IN_LIST FEATURES)
list(APPEND OPTIONS_RELEASE "-DwxBUILD_DEBUG_LEVEL=0")
@@ -69,8 +73,8 @@ if(VCPKG_TARGET_IS_WINDOWS)
endif()
endif()
if("webview" IN_LIST FEATURES AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")
list(APPEND OPTIONS -DwxUSE_WEBVIEW_EDGE_STATIC=ON)
if(VCPKG_TARGET_IS_WINDOWS AND "webview" IN_LIST FEATURES AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")
list(APPEND OPTIONS -DwxUSE_WEBVIEW_EDGE_STATIC=ON)
endif()
vcpkg_find_acquire_program(PKGCONFIG)

View File

@@ -1,6 +1,7 @@
{
"name": "wxwidgets",
"version": "3.3.1",
"port-version": 1,
"description": [
"Widget toolkit and tools library for creating graphical user interfaces (GUIs) for cross-platform applications. ",
"Set WXWIDGETS_USE_STL in a custom triplet to build with the wxUSE_STL build option.",
@@ -102,7 +103,10 @@
"webview": {
"description": "The Edge backend uses Microsoft's Edge WebView2",
"dependencies": [
"webview2"
{
"name": "webview2",
"platform": "windows"
}
]
}
}

View File

@@ -1006,6 +1006,7 @@ vcpkg-ci-vxl:x64-windows-static-md=pass
vcpkg-ci-vxl:x64-windows-static=pass
vcpkg-ci-vxl:x64-windows=pass
vcpkg-ci-vxl:x86-windows=pass
vcpkg-ci-wxwidgets:arm64-osx=pass
vcpkg-ci-wxwidgets:arm64-windows-static-md=pass
vcpkg-ci-wxwidgets:arm64-windows=pass
vcpkg-ci-wxwidgets:x64-linux=pass

View File

@@ -1583,8 +1583,6 @@ wxchartdir:arm64-windows = cascade
wxchartdir(uwp) = cascade
wxcharts:arm64-uwp = cascade
wxcharts:x64-uwp = cascade
wxwidgets[webview]:arm64-osx = cascade
wxwidgets[webview](!windows) = cascade
xbitmaps:arm64-uwp = cascade
xbitmaps:x64-uwp = cascade
xcb:arm64-uwp = cascade

View File

@@ -10658,7 +10658,7 @@
},
"wxwidgets": {
"baseline": "3.3.1",
"port-version": 0
"port-version": 1
},
"wyhash": {
"baseline": "2023-12-03",

View File

@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "c3b7a128822dda9b567ad7efaa48fbcdf889e7d0",
"version": "3.3.1",
"port-version": 1
},
{
"git-tree": "42070e5c6991073f4b9a5477d9fb2b9d1267008e",
"version": "3.3.1",