Skip to content

Release 5.4 update gdcm - #6059

Merged
thewtex merged 3 commits into
InsightSoftwareConsortium:release-5.4from
thewtex:release-5.4-update-gdcm
Apr 15, 2026
Merged

thewtex merged 3 commits into
InsightSoftwareConsortium:release-5.4from
thewtex:release-5.4-update-gdcm

Conversation

@thewtex

@thewtex thewtex commented Apr 14, 2026

Copy link
Copy Markdown
Member

Updating GDCM to the current release branch on ITK release-5.4.

thewtex and others added 3 commits April 14, 2026 09:36
Code extracted from:

    https://github.com/malaterre/GDCM.git

at commit dacccb6c04ee13f6958359c193f804358f4672d7 (release).
* upstream-GDCM:
  GDCM 2026-03-10 (dacccb6c)
@greptile-apps

greptile-apps Bot commented Apr 14, 2026

Copy link
Copy Markdown
Contributor

Too many files changed for review. (316 files found, 100 file limit)

@thewtex
thewtex requested review from blowekamp and hjmjohnson April 14, 2026 13:53
@blowekamp

Copy link
Copy Markdown
Member

One concern I have is when this branch in merged into release and then main. The main branch can be merged with "ours" stragegy to ensure that the changes here don't effect release/main. However, the gdcm sub-tree will have different commits it's unclear to me how best to manage this.

@bradking Any advice on how to manage the sub-tree for updated to a release branch?

@bradking

Copy link
Copy Markdown
Member

The release-5.4 branch is not currently fully merged into main, and has merge conflicts. Since this PR is based on release-5.4, it cannot be merged to main by any strategy without bringing in more history that's not part of this PR. I suggest resolving that outside this PR first.

@blowekamp

Copy link
Copy Markdown
Member

That seems like regular issue with the release-5.4 not being merged into release and main branches

@hjmjohnson hjmjohnson 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.

I have no problems with this approach. A careful merge into upstream/main might be needed, but that should not be hard to accomplish.

@thewtex

thewtex commented Apr 14, 2026

Copy link
Copy Markdown
Member Author

We are queuing a number of patches on release-5.4 before careful merge to main

@hjmjohnson hjmjohnson mentioned this pull request Apr 15, 2026
30 of 31 tasks
@hjmjohnson

Copy link
Copy Markdown
Member

@thewtex You are likely the one to do the next steps, so I'll let you merge this.

@thewtex
thewtex merged commit f9a2e13 into InsightSoftwareConsortium:release-5.4 Apr 15, 2026
17 checks passed
@thewtex
thewtex deleted the release-5.4-update-gdcm branch April 15, 2026 22:02
hjmjohnson pushed a commit to hjmjohnson/ITK that referenced this pull request May 6, 2026
…e-5.4-update-gdcm

Release 5.4 update gdcm
hjmjohnson pushed a commit to hjmjohnson/ITK that referenced this pull request May 12, 2026
…e-5.4-update-gdcm

Release 5.4 update gdcm
hjmjohnson pushed a commit that referenced this pull request Jul 7, 2026
Add GDCM support for modern CMAKE_*_OUTPUT_DIRECTORY
variables. Removes setting legacy CMake cache variables.

Internlly GDCM still uses the legacy names.

Backport to release-5.4: only the src/CMakeLists.txt wrapper hunk is
applied. The src/gdcm/CMakeLists.txt portion of the original commit
already landed on release-5.4 via the GDCM upstream update (PR #6059),
so its compatibility shim was emitting deprecation warnings because the
wrapper kept setting EXECUTABLE_OUTPUT_PATH / LIBRARY_OUTPUT_PATH.
Removing those set() calls fixes the CMake deprecation warnings reported
in issue #6551.

(cherry picked from commit d5cf8de)

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants