restrict includes for CMake#1518
Merged
KrisThielemans merged 5 commits intoUCL:masterfrom Feb 6, 2025
Merged
Conversation
This was referenced Oct 1, 2024
We had some remaining "global" include_directories. Using target_include_directories means it's more specific, and we don't need to explicitly export them anymore. This reduces possible conflicts when importing STIR.
It turns out that we don't need `include(${ITK_USE_FILE})` in
STIRConfig.cmake. This therefore avoids adding the ITK include directory
to the global include path.
Effectively fixes UCL#432 as when building STIR, we don't mind (currently
anyway).
KrisThielemans
force-pushed
the
CMake_restrict_includes
branch
from
42743e6 to
18d4b4e
Compare
Collaborator
Author
So, we currently need HDF5 as a dependency of buildblock as well. |
Collaborator
Author
|
KrisThielemans
force-pushed
the
CMake_restrict_includes
branch
from
46a8d27 to
2872adb
Compare
KrisThielemans
force-pushed
the
CMake_restrict_includes
branch
from
2872adb to
ab3aa1c
Compare
As we currently do not depend on IO due to circular dependencies, we need to add it explicitly.
KrisThielemans
force-pushed
the
CMake_restrict_includes
branch
from
ab3aa1c to
e88bbf5
Compare
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
We had some remaining "global"
include_directories. Usingtarget_include_directoriesmeans it's more specific, and we don't need to explicitly export them anymore, and neither do they need to be added to the global include path inSTIRConfig.cmake.Similarly, the following line is not needed
STIR/src/cmake/STIRConfig.cmake.in
Line 82 in 6417022
This PR reduces possible conflicts when importing STIR.