From 2c5fb240d23d481275b45b7b0c49969190affb2c Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 6 Oct 2021 12:48:25 +0200 Subject: [PATCH 1/4] Control exported protobuf dependency --- ports/opencv4/portfile.cmake | 4 ++-- ports/opencv4/vcpkg.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index 760cfbea7efa09..45cf964d54d6d3 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 54ae370087f6a2..ce572115d220c4 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": [ From d6f96c229771cba9a0b30556f0409afd3e52a893 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 6 Oct 2021 12:48:44 +0200 Subject: [PATCH 2/4] Update versions --- versions/baseline.json | 2 +- versions/o-/opencv4.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 3aa7be4c82f428..e24ae9d07a3d97 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4822,7 +4822,7 @@ }, "opencv4": { "baseline": "4.5.3", - "port-version": 2 + "port-version": 3 }, "opendnp3": { "baseline": "3.1.0", diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index 9493353a53dcc4..8c909b6e4ab342 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d48f3aabd1d417854360efb92874f3b533f83966", + "version": "4.5.3", + "port-version": 3 + }, { "git-tree": "6b5539ab3cd468944f8d46698c610285319bf0f7", "version": "4.5.3", From 60f74a24628d5957a75da61b38f4b812d0da0ee4 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 6 Oct 2021 21:32:53 +0200 Subject: [PATCH 3/4] Control exported protobuf dependency --- ports/opencv3/portfile.cmake | 4 ++-- ports/opencv3/vcpkg.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/opencv3/portfile.cmake b/ports/opencv3/portfile.cmake index 36d012663f37a5..2a435a97ef37c0 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 f750ae57b19b05..b08ac1c20e9f5f 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": [ From 2573ef58aba416407d19f9b06eccf2e57333824d Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 6 Oct 2021 21:38:07 +0200 Subject: [PATCH 4/4] Update versions --- versions/baseline.json | 2 +- versions/o-/opencv3.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index e24ae9d07a3d97..9f7425aa63215b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4818,7 +4818,7 @@ }, "opencv3": { "baseline": "3.4.15", - "port-version": 2 + "port-version": 3 }, "opencv4": { "baseline": "4.5.3", diff --git a/versions/o-/opencv3.json b/versions/o-/opencv3.json index 0e9d565c6c91d0..835620406cd5b5 100644 --- a/versions/o-/opencv3.json +++ b/versions/o-/opencv3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dee8e4cb055e92ed1708903f73dcca96b0793fe5", + "version": "3.4.15", + "port-version": 3 + }, { "git-tree": "27a6a94907d72955e9d473dfbce89ae851ee1bda", "version": "3.4.15",