Skip to content

Commit b77f596

Browse files
committed
skbuild: Use "." for PY_SITE_PACKAGES
With scikit-build 0.7 or later, the CMAKE_INSTALL_PREFIX has changed from the previous value. Use a relative current directory to install inside CMAKE_INSTALL_PREFIX, which skbuild puts into the package. It cannot be an absolute path to CMAKE_INSTALL_PREFIX because skbuild puts the files into the "data" package data directory.
1 parent 462ebbd commit b77f596

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

scripts/internal/manylinux-build-wheels.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ for PYBIN in "${PYBINARIES[@]}"; do
9494
-DWRAP_ITK_INSTALL_COMPONENT_IDENTIFIER:STRING=PythonWheel \
9595
-DWRAP_ITK_INSTALL_COMPONENT_PER_MODULE:BOOL=ON \
9696
-DITK_WRAP_unsigned_short:BOOL=ON \
97-
-DPY_SITE_PACKAGES_PATH:PATH=${SKBUILD_CMAKE_INSTALL_PREFIX} \
97+
-DPY_SITE_PACKAGES_PATH:PATH="." \
9898
-DITK_LEGACY_SILENT:BOOL=ON \
9999
-DITK_WRAP_PYTHON:BOOL=ON \
100100
-DITK_WRAP_PYTHON_LEGACY:BOOL=OFF \

scripts/macpython-build-wheels.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ for VENV in "${VENVS[@]}"; do
8080
source_path=${SCRIPT_DIR}/../standalone-build/ITK-source
8181
build_path="${SCRIPT_DIR}/../ITK-${py_mm}-macosx_x86_64"
8282
SETUP_PY_CONFIGURE="${script_dir}/setup_py_configure.py"
83-
SKBUILD_CMAKE_INSTALL_PREFIX=$(${PYTHON_EXECUTABLE} -c "from skbuild.constants import CMAKE_INSTALL_DIR; print(CMAKE_INSTALL_DIR)")
8483

8584
# Clean up previous invocations
8685
rm -rf ${build_path}
@@ -131,7 +130,7 @@ for VENV in "${VENVS[@]}"; do
131130
-DPYTHON_LIBRARY:FILEPATH=${PYTHON_LIBRARY} \
132131
-DWRAP_ITK_INSTALL_COMPONENT_IDENTIFIER:STRING=PythonWheel \
133132
-DWRAP_ITK_INSTALL_COMPONENT_PER_MODULE:BOOL=ON \
134-
-DPY_SITE_PACKAGES_PATH:PATH=${SKBUILD_CMAKE_INSTALL_PREFIX} \
133+
"-DPY_SITE_PACKAGES_PATH:PATH=." \
135134
-DITK_LEGACY_SILENT:BOOL=ON \
136135
-DITK_WRAP_PYTHON:BOOL=ON \
137136
-DITK_WRAP_PYTHON_LEGACY:BOOL=OFF \

scripts/windows_build_wheels.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,6 @@ def build_wrapped_itk(
7474
script_file.close()
7575
os.remove(script_file.name)
7676

77-
py_site_packages_path = os.path.join(ROOT_DIR, "_skbuild", "cmake-install")
78-
7977
# Build ITK python
8078
with push_dir(directory=build_path, make_directory=True), \
8179
push_env(**build_env):
@@ -93,7 +91,7 @@ def build_wrapped_itk(
9391
"-DPYTHON_LIBRARY:FILEPATH=%s" % python_library,
9492
"-DWRAP_ITK_INSTALL_COMPONENT_IDENTIFIER:STRING=PythonWheel",
9593
"-DWRAP_ITK_INSTALL_COMPONENT_PER_MODULE:BOOL=ON",
96-
"-DPY_SITE_PACKAGES_PATH:PATH=%s" % py_site_packages_path,
94+
"-DPY_SITE_PACKAGES_PATH:PATH=.",
9795
"-DITK_LEGACY_SILENT:BOOL=ON",
9896
"-DITK_WRAP_PYTHON:BOOL=ON",
9997
"-DITK_WRAP_PYTHON_LEGACY:BOOL=OFF",

0 commit comments

Comments
 (0)