BUG: Update SimpleITK to fix import adding missing use of custom namespace#7812
Merged
jcfr merged 2 commits intoSlicer:mainfrom Jun 22, 2024
Merged
Conversation
This comment was marked as outdated.
This comment was marked as outdated.
f5344b6 to
a844adc
Compare
This comment was marked as outdated.
This comment was marked as outdated.
b1a0da2 to
14a6f68
Compare
Ensure SimpleITK is built using the Slicer Python environment by fixing the configuration to account for changes introduced in SimpleITK/SimpleITK@1b7d670b2, which uses the new CMake FindPython module. This commit addresses the following warning: ``` CMake Warning at /path/to/SimpleITK/CMake/sitkLanguageOptions.cmake:110 (message): Use Python_EXECUTABLE! Ignoring PYTHON_EXECUTABLE: ``` Additionally, it resolves the error encountered when using CMake versions earlier than 3.24: ``` CMake Error at /path/to/cmake-3.22.2-linux-x86_64/share/cmake-3.22/Modules/FindPackageHandleStandardArgs.cmake:230 (message): Could NOT find Python (missing: Interpreter Development.Module) Call Stack (most recent call first): /path/to/cmake-3.22.2-linux-x86_64/share/cmake-3.22/Modules/FindPackageHandleStandardArgs.cmake:594 (_FPHSA_FAILURE_MESSAGE) /path/to/cmake-3.22.2-linux-x86_64/share/cmake-3.22/Modules/FindPython.cmake:561 (find_package_handle_standard_args) Wrapping/Python/CMakeLists.txt:7 (find_package) ``` To support CMake versions earlier than 3.24, the _Python_VERSION variables are explicitly passed. This workaround is necessary because the fix introduced in Kitware/CMake@ece3bedbf (FindPython: fix error on multiple queries with different COMPONENTS) is not available in older CMake versions. List of SimpleITK changes: ``` $ git shortlog 236005d4..4328a91af --no-merges Jean-Christophe Fillion-Robin (2): COMP: Ensure Python_* variables are passed to SimpleITK inner-build COMP: Support CMake < 3.24 passing _Python_VERSION vars to inner-build ```
…space Update remaining use of `itk::simple` introduced after Slicer/SimpleITK@f95590f7 and omitted when updating SimpleITK in the context of Slicer/Slicer@acf3dd47 (ENH: Update ITK to 5.4.0) List of SimpleITK changes: ``` $ git shortlog 4328a91a..441c59aa --no-merges Jean-Christophe Fillion-Robin (2): COMP: Update remaining Swig interface files to use "slicer_itk" namespace COMP: Revert namespace changes in "sitkPathType.i" to fix build issues ```
2ff50b1 to
d99dc71
Compare
Member
|
Thank you for following up JC! |
Contributor
|
I've tested this and I can confirm that SimpleITK in the latest Slicer Preview Release works well! |
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
3 participants
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.
BUG: Update SimpleITK to fix import adding missing use of custom namespace
Update remaining use of
itk::simpleintroduced after Slicer/SimpleITK@f95590f7 and omitted when updating SimpleITK in the context of acf3dd47 (ENH: Update ITK to 5.4.0)List of SimpleITK changes:
COMP: Ensure SimpleITK is built using Slicer Python environment
Ensure SimpleITK is built using the Slicer Python environment by fixing the configuration to account for changes introduced in SimpleITK/SimpleITK@1b7d670b2, which uses the new CMake FindPython module.
This commit addresses the following warning:
Additionally, it resolves the error encountered when using CMake versions earlier than 3.24:
To support CMake versions earlier than 3.24, the _Python_VERSION variables are explicitly passed.
This workaround is necessary because the fix introduced in Kitware/CMake@ece3bedbf (FindPython: fix error on multiple queries with different COMPONENTS) is not available in older CMake versions.
List of SimpleITK changes:
This pull request supersedes #7810
Related pull requests and issues: