Fixes for `wxUSE_XXX` in CMake (PR #26473)

VZ

unread,

May 17, 2026, 3:11:37 PM (2 days ago) May 17

to wx-...@googlegroups.com, Subscribed

@MaartenBent I'd be grateful for your review of this, TIA!

You can view, comment on, or merge this pull request online at:

https://github.com/wxWidgets/wxWidgets/pull/26473

Commit Summary

655d11b Remove redundant preprocessor checks from CMake setup.h.in
5aca6e1 Use CMake wxUSE_GRAPHICS_DIRECT2D option in setup.h.in
b4f88b5 Don't always force wxUSE_GRAPHICS_DIRECT2D=ON for MSVC
cbeb938 Don't force wxUSE_WEBREQUEST_URLSESSION to ON under macOS

File Changes

(2 files)

M build/cmake/init.cmake (7)
M build/cmake/setup.h.in (44)

Patch Links:

—
Reply to this email directly, view it on GitHub, or unsubscribe.
Triage notifications on the go with GitHub Mobile for iOS or Android.
You are receiving this because you are subscribed to this thread.

Maarten

unread,

May 17, 2026, 4:13:51 PM (2 days ago) May 17

to wx-...@googlegroups.com, Subscribed

MaartenBent left a comment (wxWidgets/wxWidgets#26473)

build/cmake/setup.h.in is a copy of ./setup.h.in, which also has the double defines. Not sure if this part is auto-generated or just copied.

Decoupling wxUSE_GRAPHICS_DIRECT2D from wxUSE_GRAPHICS_CONTEXT seems fine to me. Originally it tried to match the defines in the visual studio setup.h file. Just make sure the code correctly handles the case when wxUSE_GRAPHICS_CONTEXT is off but wxUSE_GRAPHICS_DIRECT2D is on.

—
Reply to this email directly, view it on GitHub, or unsubscribe.
Triage notifications on the go with GitHub Mobile for iOS or Android.

You are receiving this because you are subscribed to this thread.

VZ

unread,

May 17, 2026, 6:27:49 PM (2 days ago) May 17

to wx-...@googlegroups.com, Subscribed

vadz left a comment (wxWidgets/wxWidgets#26473)

build/cmake/setup.h.in is a copy of ./setup.h.in, which also has the double defines. Not sure if this part is auto-generated or just copied.

Ugh, sorry for stupidly forgetting about this. These checks come from setup_inc.h so I need to either modify it or improve the generation script. This needs more time than I have right now :-(

Decoupling wxUSE_GRAPHICS_DIRECT2D from wxUSE_GRAPHICS_CONTEXT seems fine to me. Originally it tried to match the defines in the visual studio setup.h file. Just make sure the code correctly handles the case when wxUSE_GRAPHICS_CONTEXT is off but wxUSE_GRAPHICS_DIRECT2D is on.

Is this a valid build configuration? I don't think so but OTOH include/wx/msw/chkconf.h doesn't check for this, so maybe it is...

—
Reply to this email directly, view it on GitHub, or unsubscribe.
Triage notifications on the go with GitHub Mobile for iOS or Android.

You are receiving this because you are subscribed to this thread.

Reply all

Reply to author

Forward