Merge pull request #637 from orbisvicis/master

asenyaev · web-flow · commit 056f9000e96d · 2022-04-07T13:24:36.000+03:00
Synchronize with scikit-build
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,7 @@
 [build-system]
 requires = [
-  "setuptools", "wheel", "scikit-build", "cmake", "pip",
+  "setuptools", "wheel", "cmake", "pip",
+  "scikit-build>=0.13.2",
   "numpy==1.13.3; python_version=='3.6' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
   "numpy==1.14.5; python_version=='3.7' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
   "numpy==1.17.3; python_version=='3.8' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
diff --git a/setup.py b/setup.py
@@ -452,7 +452,7 @@ def _classify_installed_files_override(
             data_files,
             # To get around a check that prepends source dir to paths and breaks package detection code.
             cmake_source_dir="",
-            cmake_install_dir=cmake_install_reldir,
+            _cmake_install_dir=cmake_install_reldir,
         )
 
 

Original file line number	Diff line number	Diff line change
`@@ -452,7 +452,7 @@ def _classify_installed_files_override(`
`452`	`452`	`data_files,`
`453`	`453`	`# To get around a check that prepends source dir to paths and breaks package detection code.`
`454`	`454`	`cmake_source_dir="",`
`455`		`- cmake_install_dir=cmake_install_reldir,`
	`455`	`+ _cmake_install_dir=cmake_install_reldir,`
`456`	`456`	`)`
`457`	`457`
`458`	`458`