Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 056f900

Browse filesBrowse files
authored
Merge pull request opencv#637 from orbisvicis/master
Synchronize with scikit-build
2 parents 0eb6c12 + 96cffde commit 056f900
Copy full SHA for 056f900

File tree

2 files changed

+3
-2
lines changed
Filter options

2 files changed

+3
-2
lines changed

‎pyproject.toml

Copy file name to clipboardExpand all lines: pyproject.toml
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[build-system]
22
requires = [
3-
"setuptools", "wheel", "scikit-build", "cmake", "pip",
3+
"setuptools", "wheel", "cmake", "pip",
4+
"scikit-build>=0.13.2",
45
"numpy==1.13.3; python_version=='3.6' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
56
"numpy==1.14.5; python_version=='3.7' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
67
"numpy==1.17.3; python_version=='3.8' and platform_machine != 'aarch64' and platform_machine != 'arm64'",

‎setup.py

Copy file name to clipboardExpand all lines: setup.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ def _classify_installed_files_override(
452452
data_files,
453453
# To get around a check that prepends source dir to paths and breaks package detection code.
454454
cmake_source_dir="",
455-
cmake_install_dir=cmake_install_reldir,
455+
_cmake_install_dir=cmake_install_reldir,
456456
)
457457

458458

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.