diff options
| author | Fei Chong <ZgblKylin@users.noreply.github.com> | 2020-10-21 04:20:20 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-20 13:20:20 -0700 |
| commit | b275dd0cc08687f936fe84ea2325ca794f51bb2a (patch) | |
| tree | 4b1dfa451061aeb48c64cf8c6b05aa9631c8e3d1 | |
| parent | 87573efdfa01c89334d94d4c3f7cf1fe20505f80 (diff) | |
| download | vcpkg-b275dd0cc08687f936fe84ea2325ca794f51bb2a.tar.gz vcpkg-b275dd0cc08687f936fe84ea2325ca794f51bb2a.zip | |
[opencv] Move dependency of protobuf from core to dnn/flann (#13987)
Co-authored-by: Fei Chong <fei.chong@calmcar.com>
Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
| -rw-r--r-- | ports/opencv3/CONTROL | 5 | ||||
| -rw-r--r-- | ports/opencv3/portfile.cmake | 6 | ||||
| -rw-r--r-- | ports/opencv4/CONTROL | 5 | ||||
| -rw-r--r-- | ports/opencv4/portfile.cmake | 6 |
4 files changed, 12 insertions, 10 deletions
diff --git a/ports/opencv3/CONTROL b/ports/opencv3/CONTROL index 0c0c75caa..f6c2f926b 100644 --- a/ports/opencv3/CONTROL +++ b/ports/opencv3/CONTROL @@ -1,7 +1,7 @@ Source: opencv3 Version: 3.4.10 -Port-Version: 1 -Build-Depends: protobuf, zlib +Port-Version: 2 +Build-Depends: zlib Homepage: https://github.com/opencv/opencv Description: computer vision library Default-Features: dnn, jpeg, opengl, png, tiff, webp @@ -10,6 +10,7 @@ Feature: nonfree Description: allow nonfree and unredistributable libraries Feature: flann +Build-Depends: protobuf Description: opencv_flann module Feature: contrib diff --git a/ports/opencv3/portfile.cmake b/ports/opencv3/portfile.cmake index 5a2b5d8ea..98f3b32ed 100644 --- a/ports/opencv3/portfile.cmake +++ b/ports/opencv3/portfile.cmake @@ -293,8 +293,8 @@ vcpkg_configure_cmake( -DBUILD_JAVA=OFF -DCURRENT_INSTALLED_DIR=${CURRENT_INSTALLED_DIR} ###### PROTOBUF - -DPROTOBUF_UPDATE_FILES=ON - -DUPDATE_PROTO_FILES=ON + -DPROTOBUF_UPDATE_FILES=${BUILD_opencv_flann} + -DUPDATE_PROTO_FILES=${BUILD_opencv_flann} ###### PYLINT/FLAKE8 -DENABLE_PYLINT=OFF -DENABLE_FLAKE8=OFF @@ -317,7 +317,7 @@ vcpkg_configure_cmake( -DWITH_MATLAB=OFF -DWITH_MSMF=${WITH_MSMF} -DWITH_OPENMP=OFF - -DWITH_PROTOBUF=ON + -DWITH_PROTOBUF=${BUILD_opencv_flann} -DWITH_OPENCLAMDBLAS=OFF -DWITH_TBB=${WITH_TBB} -DWITH_VTK=${WITH_VTK} diff --git a/ports/opencv4/CONTROL b/ports/opencv4/CONTROL index c50302fa0..c384e8725 100644 --- a/ports/opencv4/CONTROL +++ b/ports/opencv4/CONTROL @@ -1,7 +1,7 @@ Source: opencv4 Version: 4.3.0 -Port-Version: 2 -Build-Depends: protobuf, zlib +Port-Version: 3 +Build-Depends: zlib Homepage: https://github.com/opencv/opencv Description: computer vision library Default-Features: dnn, jpeg, opengl, png, tiff, webp @@ -22,6 +22,7 @@ Build-Depends: opencv4[core,contrib], cuda, cudnn Description: CUDA support for opencv Feature: dnn +Build-Depends: protobuf Description: Enable dnn module Feature: eigen diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index 0b25bb1c8..7b0849851 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -325,8 +325,8 @@ vcpkg_configure_cmake( -DBUILD_JAVA=OFF -DCURRENT_INSTALLED_DIR=${CURRENT_INSTALLED_DIR} ###### PROTOBUF - -DPROTOBUF_UPDATE_FILES=ON - -DUPDATE_PROTO_FILES=ON + -DPROTOBUF_UPDATE_FILES=${BUILD_opencv_dnn} + -DUPDATE_PROTO_FILES=${BUILD_opencv_dnn} ###### PYLINT/FLAKE8 -DENABLE_PYLINT=OFF -DENABLE_FLAKE8=OFF @@ -348,7 +348,7 @@ vcpkg_configure_cmake( -DWITH_IPP=${WITH_IPP} -DWITH_MSMF=${WITH_MSMF} -DWITH_OPENMP=${WITH_OPENMP} - -DWITH_PROTOBUF=ON + -DWITH_PROTOBUF=${BUILD_opencv_dnn} -DWITH_TBB=${WITH_TBB} -DWITH_VTK=${WITH_VTK} -DWITH_OPENJPEG=OFF |