Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vicroms merged 5 commits into from
Jan 7, 2026
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ee074a0
Fix wxWidgets webview feature for macOS and Linux cross-platform support
rmpowell77 Jan 4, 2026
62faa81
Fixing unit tests
rmpowell77 Jan 4, 2026
59e67b5
removing the cascade as we should be able to pass on all the version …
rmpowell77 Jan 4, 2026
f466161
Update wxwidgets version database with correct git-tree SHA
rmpowell77 Jan 6, 2026
48663e0
Merge branch 'master' of github.com:Microsoft/vcpkg into pr/49233
vicroms Jan 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions ports/wxwidgets/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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)
Expand Down
6 changes: 5 additions & 1 deletion ports/wxwidgets/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.",
Expand Down Expand Up @@ -102,7 +103,10 @@
"webview": {
"description": "The Edge backend uses Microsoft's Edge WebView2",
"dependencies": [
"webview2"
{
"name": "webview2",
"platform": "windows"
}
]
}
}
Expand Down
1 change: 1 addition & 0 deletions scripts/ci.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions scripts/ci.feature.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1582,8 +1582,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
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10626,7 +10626,7 @@
},
"wxwidgets": {
"baseline": "3.3.1",
"port-version": 0
"port-version": 1
},
"wyhash": {
"baseline": "2023-12-03",
Expand Down
5 changes: 5 additions & 0 deletions versions/w-/wxwidgets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "c3b7a128822dda9b567ad7efaa48fbcdf889e7d0",
"version": "3.3.1",
"port-version": 1
},
{
"git-tree": "42070e5c6991073f4b9a5477d9fb2b9d1267008e",
"version": "3.3.1",
Expand Down