diff options
Diffstat (limited to 'ports')
| -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 |
4 files changed, 6 insertions, 6 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": [ |