Skip to content

Commit

Permalink
[opencv] Enable BUILD_IPP_IW when ipp feature is enable (#27727)
Browse files Browse the repository at this point in the history
  • Loading branch information
Cheney-W authored Nov 10, 2022
1 parent 3030c48 commit 9db21ff
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 6 deletions.
2 changes: 1 addition & 1 deletion ports/opencv3/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,6 @@ vcpkg_cmake_configure(
-DBUILD_WEBP=OFF
-DBUILD_ZLIB=OFF
-DBUILD_TBB=OFF
-DBUILD_IPP_IW=OFF
-DBUILD_ITT=OFF
###### Disable build 3rd party components
-DBUILD_PROTOBUF=OFF
Expand Down Expand Up @@ -397,6 +396,7 @@ vcpkg_cmake_configure(
-DBUILD_opencv_quality=${BUILD_opencv_quality}
###### Additional build flags
${ADDITIONAL_BUILD_FLAGS}
-DBUILD_IPP_IW=${WITH_IPP}
)

vcpkg_cmake_install()
Expand Down
2 changes: 1 addition & 1 deletion ports/opencv3/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "opencv3",
"version": "3.4.18",
"port-version": 2,
"port-version": 3,
"description": "Open Source Computer Vision Library",
"homepage": "https://github.com/opencv/opencv",
"license": "BSD-3-Clause",
Expand Down
2 changes: 1 addition & 1 deletion ports/opencv4/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,6 @@ vcpkg_cmake_configure(
-DBUILD_WEBP=OFF
-DBUILD_ZLIB=OFF
-DBUILD_TBB=OFF
-DBUILD_IPP_IW=OFF
-DBUILD_ITT=OFF
###### Disable build 3rd party components
-DBUILD_PROTOBUF=OFF
Expand Down Expand Up @@ -447,6 +446,7 @@ vcpkg_cmake_configure(
-DBUILD_opencv_rgbd=OFF
###### Additional build flags
${ADDITIONAL_BUILD_FLAGS}
-DBUILD_IPP_IW=${WITH_IPP}
)

vcpkg_cmake_install()
Expand Down
2 changes: 1 addition & 1 deletion ports/opencv4/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "opencv4",
"version": "4.6.0",
"port-version": 7,
"port-version": 8,
"description": "computer vision library",
"homepage": "https://github.com/opencv/opencv",
"license": "Apache-2.0",
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -5430,11 +5430,11 @@
},
"opencv3": {
"baseline": "3.4.18",
"port-version": 2
"port-version": 3
},
"opencv4": {
"baseline": "4.6.0",
"port-version": 7
"port-version": 8
},
"opendnp3": {
"baseline": "3.1.1",
Expand Down
5 changes: 5 additions & 0 deletions versions/o-/opencv3.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ab8ee26d1e4a0a937e516efdc21d4e2cf784f278",
"version": "3.4.18",
"port-version": 3
},
{
"git-tree": "ab004823dbf456854654e2e0851be69ee4e5c5c5",
"version": "3.4.18",
Expand Down
5 changes: 5 additions & 0 deletions versions/o-/opencv4.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "3ba183524c95cc3abfd86ecfaa1892dab4b89326",
"version": "4.6.0",
"port-version": 8
},
{
"git-tree": "f8f6d4451f824e2247a7e33c3f092cd836eb336b",
"version": "4.6.0",
Expand Down

0 comments on commit 9db21ff

Please sign in to comment.