diff options
| author | NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> | 2021-04-30 01:45:23 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-29 10:45:23 -0700 |
| commit | 6537078e8ae397e5fb959e839c79e86c836065c2 (patch) | |
| tree | ea477542b3f6ac7c833d203ee7081e3785139d97 | |
| parent | 58678a961f63f2a2121c90c8fd9b6423c42a46b4 (diff) | |
| download | vcpkg-6537078e8ae397e5fb959e839c79e86c836065c2.tar.gz vcpkg-6537078e8ae397e5fb959e839c79e86c836065c2.zip | |
[opencv4] Fix OPTIONS BUILD_opencv_gapi (#17354)
* [opencv4] Fix OPTIONS BUILD_opencv_gapi
* Update version files
| -rw-r--r-- | ports/opencv4/portfile.cmake | 2 | ||||
| -rw-r--r-- | ports/opencv4/vcpkg.json | 1 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/o-/opencv4.json | 5 |
4 files changed, 8 insertions, 2 deletions
diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index 33982df0e..57fdeb32e 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -375,7 +375,7 @@ vcpkg_configure_cmake( -DBUILD_opencv_dnn=${BUILD_opencv_dnn} ###### The following modules are disabled for UWP -DBUILD_opencv_quality=${BUILD_opencv_quality} - -DBUILD_opencv_gapi=${DBUILD_opencv_gapi} + -DBUILD_opencv_gapi=${BUILD_opencv_gapi} ###### The following module is disabled because it's broken #https://github.com/opencv/opencv_contrib/issues/2307 -DBUILD_opencv_rgbd=OFF ###### Additional build flags diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json index 71513f260..7515471ca 100644 --- a/ports/opencv4/vcpkg.json +++ b/ports/opencv4/vcpkg.json @@ -1,6 +1,7 @@ { "name": "opencv4", "version": "4.5.1", + "port-version": 1, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 7e6abced9..1a7b4672d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4462,7 +4462,7 @@ }, "opencv4": { "baseline": "4.5.1", - "port-version": 0 + "port-version": 1 }, "opendnp3": { "baseline": "3.1.0", diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index 631be40cf..25e9fa973 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "c719098632c388044e4cd242a1f5276e81727466", + "version": "4.5.1", + "port-version": 1 + }, + { "git-tree": "ba505df8f61764e9b4667b04958c748237d12d23", "version": "4.5.1", "port-version": 0 |