diff options
| author | Kai Pastor <dg0yt@darc.de> | 2021-10-07 01:58:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-06 16:58:41 -0700 |
| commit | 15af0031946a4d451c38faa3722812a4a03370b5 (patch) | |
| tree | c14d965f1b783dcc1d5a764e6b6a91e1cf4cb497 | |
| parent | 5033b3e2e8c9235bc867ca09b68e8958e27dcaab (diff) | |
| download | vcpkg-15af0031946a4d451c38faa3722812a4a03370b5.tar.gz vcpkg-15af0031946a4d451c38faa3722812a4a03370b5.zip | |
[opencv4,opencv3] Control exported protobuf dependency (#20550)
* Control exported protobuf dependency
* Update versions
* Control exported protobuf dependency
* Update versions
| -rw-r--r-- | ports/opencv3/portfile.cmake | 4 | ||||
| -rw-r--r-- | ports/opencv3/vcpkg.json | 2 | ||||
| -rw-r--r-- | ports/opencv4/portfile.cmake | 4 | ||||
| -rw-r--r-- | ports/opencv4/vcpkg.json | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 4 | ||||
| -rw-r--r-- | versions/o-/opencv3.json | 5 | ||||
| -rw-r--r-- | versions/o-/opencv4.json | 5 |
7 files changed, 18 insertions, 8 deletions
diff --git a/ports/opencv3/portfile.cmake b/ports/opencv3/portfile.cmake index 36d012663..2a435a97e 100644 --- a/ports/opencv3/portfile.cmake +++ b/ports/opencv3/portfile.cmake @@ -353,8 +353,8 @@ vcpkg_copy_pdbs() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(READ "${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake" OPENCV_MODULES) set(DEPS_STRING "include(CMakeFindDependencyMacro) -find_dependency(Protobuf CONFIG) -if(protobuf_FOUND) +if(${BUILD_opencv_flann}) + find_dependency(Protobuf CONFIG REQUIRED) if(TARGET protobuf::libprotobuf) add_library (libprotobuf INTERFACE IMPORTED) set_target_properties(libprotobuf PROPERTIES diff --git a/ports/opencv3/vcpkg.json b/ports/opencv3/vcpkg.json index f750ae57b..b08ac1c20 100644 --- a/ports/opencv3/vcpkg.json +++ b/ports/opencv3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv3", "version": "3.4.15", - "port-version": 2, + "port-version": 3, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "dependencies": [ diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index 760cfbea7..45cf964d5 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -413,8 +413,8 @@ vcpkg_copy_pdbs() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(READ "${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake" OPENCV_MODULES) set(DEPS_STRING "include(CMakeFindDependencyMacro) -find_dependency(Protobuf CONFIG) -if(protobuf_FOUND) +if(${BUILD_opencv_dnn}) + find_dependency(Protobuf CONFIG REQUIRED) if(TARGET protobuf::libprotobuf) add_library (libprotobuf INTERFACE IMPORTED) set_target_properties(libprotobuf PROPERTIES diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json index 54ae37008..ce572115d 100644 --- a/ports/opencv4/vcpkg.json +++ b/ports/opencv4/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv4", "version": "4.5.3", - "port-version": 2, + "port-version": 3, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index b47f7e924..519a538be 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4818,11 +4818,11 @@ }, "opencv3": { "baseline": "3.4.15", - "port-version": 2 + "port-version": 3 }, "opencv4": { "baseline": "4.5.3", - "port-version": 2 + "port-version": 3 }, "opendnp3": { "baseline": "3.1.0", diff --git a/versions/o-/opencv3.json b/versions/o-/opencv3.json index 0e9d565c6..835620406 100644 --- a/versions/o-/opencv3.json +++ b/versions/o-/opencv3.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "dee8e4cb055e92ed1708903f73dcca96b0793fe5", + "version": "3.4.15", + "port-version": 3 + }, + { "git-tree": "27a6a94907d72955e9d473dfbce89ae851ee1bda", "version": "3.4.15", "port-version": 2 diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index 9493353a5..8c909b6e4 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "d48f3aabd1d417854360efb92874f3b533f83966", + "version": "4.5.3", + "port-version": 3 + }, + { "git-tree": "6b5539ab3cd468944f8d46698c610285319bf0f7", "version": "4.5.3", "port-version": 2 |