Support building against DCMTK >= 3.6.7 #1224
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ompatibility This change ensures backward compatibility while preparing for future updates to DCMTK, specifically commit DCMTK/dcmtk@1ebac2d0f ("Replaced the data type of parameter 'filename'.", 2024-02-20). In this update, the parameter type changes from `const char *` to `const OFFilename`. QByteArray only provides an explicit conversion to `const char *`, but not directly to `const OFFilename` (which can be constructed from `const char *`). This explicit conversion allows seamless integration with both the current and updated DCMTK codebase.
This update maintains backward compatibility while enabling support for DCMTK's namespaced CMake targets, introduced in commit DCMTK/dcmtk@c684bb3 ("Various enhancements for DCMTK's CMake exports.", 2021-07-05). In this version, target names are prefixed with "DCMTK::", requiring adjustments to the build system ensuring the variable KIT_target_libraries is properly set. Co-authored-by: James Butler <james.butler@perkinelmer.com> Co-authored-by: Stefan Dinkelacker <s.dinkelacker@dkfz-heidelberg.de>
jcfr
changed the title
jamesobutler
approved these changes
Oct 29, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Introduces two compatibility updates for DCMTK integration:
Explicit
QByteArrayConversion for DCMTK Compatibility: Adds an explicit conversion fromQByteArraytoconst char *, preparing for changes in DCMTK's handling of thefilenameparameter (commit DCMTK/dcmtk@1ebac2d0f).Support for Namespaced DCMTK CMake Targets: Adapts the build system to support namespaced CMake targets introduced in DCMTK commit DCMTK/dcmtk@c684bb3. The update correctly sets the
KIT_target_librariesvariable to accommodate the "DCMTK::" prefix in target names.Related pull requests: