Skip to content

[cmake] mv win32gdk to builtins - #23171

Merged
bellenot merged 29 commits into
root-project:masterfrom
ferdymercury:bwin32
Oct 1, 2026
Merged

bellenot merged 29 commits into
root-project:masterfrom
ferdymercury:bwin32

Conversation

@ferdymercury

@ferdymercury ferdymercury commented Aug 27, 2026 •

Copy link
Copy Markdown
Collaborator

To better separate externals from internals

In a future PR one could improve this by creating a native CMake build system rather than custom commands.

@ferdymercury ferdymercury added clean build Ask CI to do non-incremental build on PR skip code analysis Skip the code analysis CI steps for this PR, including verifying clang-formatting and running Ruff. labels Aug 27, 2026
@ferdymercury ferdymercury reopened this Aug 27, 2026
@github-actions

github-actions Bot commented Aug 27, 2026 •

Copy link
Copy Markdown

Test Results

    23 files      23 suites   3d 22h 40m 5s ⏱️
 3 867 tests  3 864 ✅ 0 💤 3 ❌
79 926 runs  79 922 ✅ 0 💤 4 ❌

For more details on these failures, see this check.

Results for commit 20c7863.

♻️ This comment has been updated with latest results.

Comment thread CMakeLists.txt Resolved
Comment thread graf2d/win32gdk/CMakeLists.txt Resolved
@ferdymercury

This comment was marked as outdated.

@ferdymercury
ferdymercury marked this pull request as ready for review August 31, 2026 15:36
@ferdymercury
ferdymercury requested a review from bellenot as a code owner August 31, 2026 15:36
Comment thread graf2d/win32gdk/CMakeLists.txt Resolved
@ferdymercury

Copy link
Copy Markdown
Collaborator Author

CI failures seem unrelated

@ferdymercury
ferdymercury requested a review from linev September 2, 2026 06:02
@dpiparo

dpiparo commented Sep 2, 2026

Copy link
Copy Markdown
Member

Let's wait for @bellenot to have a look.

@ferdymercury ferdymercury added this to the 6.42.00 milestone Sep 15, 2026
Comment thread graf2d/win32gdk/src/TGWin32.cxx Resolved
Comment thread graf2d/win32gdk/src/TGWin32.cxx Resolved

@bellenot bellenot left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, but I'll test locally, just to be sure...

thks to bellenot
@ferdymercury

Copy link
Copy Markdown
Collaborator Author

Thanks for the review! Shall I squash and force-push? Or can you click, once ready, on "squash-on-merge" ?

@bellenot

Copy link
Copy Markdown
Member

Thanks for the review! Shall I squash and force-push? Or can you click, once ready, on "squash-on-merge" ?

You're very welcome! And I'll squash-on-merge

@bellenot
bellenot self-requested a review October 1, 2026 08:40
@bellenot bellenot assigned ferdymercury and unassigned bellenot Oct 1, 2026

@bellenot bellenot left a comment •

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, and it works locally, so I'll squash-on-merge after a last check...

@bellenot bellenot assigned bellenot and unassigned ferdymercury Oct 1, 2026
@bellenot
bellenot merged commit 0ce4728 into root-project:master Oct 1, 2026
31 of 36 checks passed
@ferdymercury
ferdymercury deleted the bwin32 branch October 1, 2026 09:12
ferdymercury added a commit to ferdymercury/root that referenced this pull request Oct 16, 2026
* [cmake] mv win32gdk to builtins

* [cmake] fix paths

* [cmake] fix path

* [win32] fix include path

* [win32] make GDKlib a private dependency

* [win32] fwd declare rather than include header

to avoid clash with std::byte

* [cmake] try fix iconv

* Pathfixes

* Update CMakeLists.txt

* fix paths

* add missing include files

* fix fw declaration

* fix duplicated definitions

* swap include paths

* missing header

* Update TGWin32.cxx

avoid undefined GetObject

* Update TGWin32VirtualGLProxy.cxx

for getcurrentthreadid

* Update TGWin32VirtualXProxy.cxx

* Apply batched suggestions from code review

Co-authored-by: ferdymercury <ferdymercury@users.noreply.github.com>

* Update TGWin32.cxx

* Update Windows4Root.h

* [cmake] avoid polluting source directory

* rm global include dirs

* Update CMakeLists.txt

* Apply suggestion from @ferdymercury

* fix include path

* missing incpath

* dupe header

* rm redundant headers

thks to bellenot
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

clean build Ask CI to do non-incremental build on PR pr:squash on merge skip code analysis Skip the code analysis CI steps for this PR, including verifying clang-formatting and running Ruff.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants