Backport CMake 2026-06 (PR #26653)
Maarten
I backported most of the changes. Except for all the changed checks in setup.cmake.
You can view, comment on, or merge this pull request online at:
https://github.com/wxWidgets/wxWidgets/pull/26653
Commit Summary
- a6eb870 CMake: Always install common headers
- 18d6230 CMake: Install with relative symlinks
- 558f956 CMake: Add wxbase_only target
- 55180fd CMake: Declare more build option dependencies
- 2c1b849 CMake: Miscellaneous backports
- 5d9cba7 CMake: Generate appropriate expat_config.h for Expat
- 64de4fd CMake: Restructure wx_add_builtin_library
- 0f18e66 CMake: Refactor applying toolkit properties
File Changes
(28 files)
- M CMakeLists.txt (24)
- M build/cmake/config.cmake (4)
- M build/cmake/demos/CMakeLists.txt (4)
- M build/cmake/functions.cmake (221)
- M build/cmake/init.cmake (29)
- M build/cmake/install.cmake (13)
- M build/cmake/lib/CMakeLists.txt (39)
- M build/cmake/lib/aui/CMakeLists.txt (5)
- M build/cmake/lib/base/CMakeLists.txt (13)
- M build/cmake/lib/expat.cmake (36)
- M build/cmake/lib/gl/CMakeLists.txt (5)
- M build/cmake/lib/html/CMakeLists.txt (5)
- M build/cmake/lib/media/CMakeLists.txt (5)
- M build/cmake/lib/net/CMakeLists.txt (6)
- M build/cmake/lib/propgrid/CMakeLists.txt (5)
- M build/cmake/lib/qa/CMakeLists.txt (5)
- M build/cmake/lib/ribbon/CMakeLists.txt (5)
- M build/cmake/lib/richtext/CMakeLists.txt (5)
- M build/cmake/lib/stc/CMakeLists.txt (5)
- M build/cmake/lib/webview/CMakeLists.txt (23)
- M build/cmake/lib/xml/CMakeLists.txt (5)
- M build/cmake/lib/xrc/CMakeLists.txt (12)
- M build/cmake/options.cmake (18)
- M build/cmake/samples/CMakeLists.txt (44)
- M build/cmake/samples/html.cmake (2)
- M build/cmake/tests/gui/CMakeLists.txt (15)
- M build/cmake/utils/CMakeLists.txt (14)
- M build/cmake/wxWidgetsConfig.cmake.in (68)
Patch Links:
- https://github.com/wxWidgets/wxWidgets/pull/26653.patch
- https://github.com/wxWidgets/wxWidgets/pull/26653.diff
—
Reply to this email directly, view it on GitHub, or unsubscribe.
Triage notifications, keep track of coding agent tasks and review pull requests on the go with GitHub Mobile for iOS and Android. Download it today!
You are receiving this because you are subscribed to this thread.
Maarten
@MaartenBent pushed 2 commits.
- b787dd0 CMake: Restructure wx_add_builtin_library
- 7171380 CMake: Refactor applying toolkit properties
—
View it on GitHub or unsubscribe.
Triage notifications, keep track of coding agent tasks and review pull requests on the go with GitHub Mobile for iOS and Android. Download it today!
You are receiving this because you are subscribed to this thread.
Maarten
@MaartenBent pushed 1 commit.
- 5e63877 CMake: Refactor applying toolkit properties
—
View it on GitHub or unsubscribe.
Triage notifications, keep track of coding agent tasks and review pull requests on the go with GitHub Mobile for iOS and Android. Download it today!
You are receiving this because you are subscribed to this thread.
VZ
vadz left a comment (wxWidgets/wxWidgets#26653)Just in case you didn't notice them (even if I know that you probably did), the CI errors look real:
/Users/runner/work/wxWidgets/wxWidgets/include/wx/wxcrt.h:1037:51: error: 'system' is unavailable: not available on iOS
in wxiOS and wrong mix of Unix and Darwin code in wxOSX build.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
Triage notifications, keep track of coding agent tasks and review pull requests on the go with GitHub Mobile for iOS and Android. Download it today!
You are receiving this because you are subscribed to this thread.
Maarten
MaartenBent left a comment (wxWidgets/wxWidgets#26653)Yeah, I noticed. Also the Undefined symbols for architecture arm64: "wxEventLoopManual::ScheduleExit(int).
So I won't backport the public/private wxUSE_GUI/wxUSE_BASE/wxTOOLKIT_DEFINITIONS. These require code changes and might not be backwards compatible.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
Triage notifications, keep track of coding agent tasks and review pull requests on the go with GitHub Mobile for iOS and Android. Download it today!
You are receiving this because you are subscribed to this thread.
Maarten
@MaartenBent pushed 1 commit.
- 06e93f6 CMake: Refactor applying toolkit properties
—
View it on GitHub or unsubscribe.
Triage notifications, keep track of coding agent tasks and review pull requests on the go with GitHub Mobile for iOS and Android. Download it today!
You are receiving this because you are subscribed to this thread.