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.

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

Jump to bottom

[opencv4] Disable building cpufeatures since it conflict with libwebp #22844

Merged
merged 2 commits into from
Feb 4, 2022
Merged

[opencv4] Disable building cpufeatures since it conflict with libwebp #22844

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
03283b2
[opencv4] Disable cpufeatures since it conflict with libwebp
Jan 28, 2022
7b7f942
version
Jan 28, 2022
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
1 change: 1 addition & 0 deletions ports/opencv4/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,6 +469,7 @@ vcpkg_cmake_configure(
-DWITH_OPENCLAMDBLAS=OFF
-DWITH_TBB=${WITH_TBB}
-DWITH_OPENJPEG=OFF
-DWITH_CPUFEATURES=OFF
###### BUILD_options (mainly modules which require additional libraries)
-DBUILD_opencv_ovis=${BUILD_opencv_ovis}
-DBUILD_opencv_dnn=${BUILD_opencv_dnn}
Expand Down
2 changes: 1 addition & 1 deletion ports/opencv4/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "opencv4",
"version": "4.5.4",
"port-version": 2,
"port-version": 3,
"description": "computer vision library",
"homepage": "https://github.com/opencv/opencv",
"dependencies": [
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4994,7 +4994,7 @@
},
"opencv4": {
"baseline": "4.5.4",
"port-version": 2
"port-version": 3
},
"opendnp3": {
"baseline": "3.1.1",
Expand Down
5 changes: 5 additions & 0 deletions versions/o-/opencv4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b170a087d34521462cd247a24f230627a272975e",
"version": "4.5.4",
"port-version": 3
},
{
"git-tree": "537abba5a070d173cf42510f86ff4ffe057dd77f",
"version": "4.5.4",
Expand Down