Skip to content

Commit ac32eda

Browse files
authored
Merge pull request #279 from SimonRit/skbuild_build
BUG: Fix compatibility with scikit-build(-core) build directory names
2 parents 8cc3daa + 697167f commit ac32eda

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

scripts/dockcross-manylinux-build-module-deps.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ for MODULE_INFO in ${ITK_MODULE_PREQ_TOPLEVEL//:/ }; do
7474

7575
echo "Cleaning up module dependency"
7676
cp ./${MODULE_NAME}/include/* include/
77-
find ${MODULE_NAME}/_skbuild -type f -wholename "**/cmake-build/include/*" -print -exec cp {} include \;
77+
find ${MODULE_NAME}/*build/*/include -type f -print -exec cp {} include \;
7878

7979
# Cache build archive
8080
if [[ `(compgen -G ./ITKPythonBuilds-linux*.tar.zst)` ]]; then

scripts/dockcross-manylinux-cleanup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ fi
3131
unlink oneTBB-prefix
3232
${rm_prefix} rm -rf ITKPythonPackage/
3333
${rm_prefix} rm -rf tools/
34-
${rm_prefix} rm -rf _skbuild/
34+
${rm_prefix} rm -rf _skbuild/ build/
3535
${rm_prefix} rm -rf ./*.egg-info/
3636
${rm_prefix} rm -rf ./ITK-*-manylinux${MANYLINUX_VERSION}_${TARGET_ARCH}/
3737
${rm_prefix} rm -rf ./ITKPythonBuilds-linux-manylinux*${MANYLINUX_VERSION}*.tar.zst

0 commit comments

Comments
 (0)