Skip to content

Backport patches made in Slicer fork #2137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blowekamp merged 2 commits into from
Jan 23, 2025
Merged

Backport patches made in Slicer fork #2137

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
437f0be
COMP: Ensure Python_* variables are passed to SimpleITK inner-build
jcfr Jun 22, 2024
c9f69a8
COMP: Support CMake < 3.24 passing _Python_VERSION vars to inner-build
jcfr Jun 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions SuperBuild/SuperBuild.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,6 +414,15 @@ foreach (_varName ${_varNames})
_varName MATCHES "^DOXYGEN_"
OR
_varName MATCHES "^CMAKE_DISABLE_FIND_PACKAGE_"
OR
_varName MATCHES "^Python\_(ROOT\_DIR|INCLUDE\_DIR|LIBRARY|LIBRARY\_DEBUG|LIBRARY\_RELEASE|EXECUTABLE)$"
# Support CMake < 3.24 by explicitly passing _Python_VERSION variables to workaround issue fixed
# in kitware/cmake@ece3bedbf (FindPython: fix error on multiple queries with different COMPONENTS)
# See https://gitlab.kitware.com/cmake/cmake/-/merge_requests/7410 for more details
OR
(_varName MATCHES "^\_Python\_VERSION$" AND CMAKE_VERSION VERSION_LESS "3.24")
OR
(_varName MATCHES "^\_Python\_VERSION\_(MAJOR|MINOR|PATCH)$" AND CMAKE_VERSION VERSION_LESS "3.24")
)
message( STATUS "Passing variable \"${_varName}=${${_varName}}\" to SimpleITK external project.")
list(APPEND SimpleITK_VARS ${_varName})
Expand Down