Skip to content

Updated submodules to 4.5.5 release #598

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.

Sign up for GitHub

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

Merged
asenyaev merged 2 commits into from
Dec 27, 2021
Merged

Updated submodules to 4.5.5 release #598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc12af6
Updated commits to 4.5.5 release
asenyaev Dec 25, 2021
ec7b7e4
Added openexr build flag
asenyaev Dec 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion opencv
Open in desktop
Submodule opencv updated 921 files
2 changes: 1 addition & 1 deletion opencv_contrib
Open in desktop
Submodule opencv_contrib updated 112 files
2 changes: 1 addition & 1 deletion opencv_extra
Open in desktop
Submodule opencv_extra updated 3581 files
1 change: 1 addition & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ def main():
"-DBUILD_PERF_TESTS=OFF",
"-DBUILD_DOCS=OFF",
"-DPYTHON3_LIMITED_API=ON",
"-DBUILD_OPENEXR=ON",
Copy link
Copy Markdown
Contributor Author

@asenyaev asenyaev Dec 26, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added this flag, because after merging opencv/opencv#21329 macOS builds are used openexr and zlib from the local environment, which could break the build in the end (error log).

]
+ (
# If it is not defined 'linker flags: /machine:X86' on Windows x64
Expand Down