Skip to content
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.

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

Skip only gapi if it was not found #642

Merged
merged 5 commits into from Mar 28, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/build_wheels_linux.yml
Expand Up @@ -171,8 +171,6 @@ jobs:

- name: Build a package
run: |
# Download all 3rdparty files
source scripts/source-packages-preparation.sh ${{ github.workspace }}
set -e
# Build and package
set -x
Expand Down
20 changes: 0 additions & 20 deletions scripts/source-packages-preparation.sh

This file was deleted.

5 changes: 2 additions & 3 deletions setup.py
Expand Up @@ -162,8 +162,6 @@ def main():
"-DPYTHON3_LIMITED_API=ON",
"-DBUILD_OPENEXR=ON",
"-DBUILD_PNG=ON",
# To have all 3rdparty files in one place for source packages
"-DOPENCV_DOWNLOAD_PATH=%s" % (os.path.join(os.path.dirname(os.path.abspath(__file__)), "opencv", "3rdparty")),
]
+ (
# If it is not defined 'linker flags: /machine:X86' on Windows x64
Expand Down Expand Up @@ -414,7 +412,8 @@ def _classify_installed_files_override(
final_install_relpaths.append(new_install_relpath)
del m, fslash_relpath, new_install_relpath
else:
if not found:
# gapi can be missed if ADE was not downloaded (network issue)
if not found and "gapi" not in relpath_re:
raise Exception("Not found: '%s'" % relpath_re)
del r, found

Expand Down