diff options
| author | huangqinjin <huangqinjin@gmail.com> | 2020-06-11 15:49:17 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-11 00:49:17 -0700 |
| commit | 0a3cc50c41c2d74a0a39a409e22b3abb5881d271 (patch) | |
| tree | ac0aa07920e530fb2b46dbe42f4720c5ce73477a | |
| parent | e9e744175b2b4a37adcc7f2d415e1af4466226a5 (diff) | |
| download | vcpkg-0a3cc50c41c2d74a0a39a409e22b3abb5881d271.tar.gz vcpkg-0a3cc50c41c2d74a0a39a409e22b3abb5881d271.zip | |
[opencv4] Fix linking halide (#11429)
| -rw-r--r-- | ports/opencv4/CONTROL | 2 | ||||
| -rw-r--r-- | ports/opencv4/portfile.cmake | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/ports/opencv4/CONTROL b/ports/opencv4/CONTROL index 4d5203b69..8aa7e06d9 100644 --- a/ports/opencv4/CONTROL +++ b/ports/opencv4/CONTROL @@ -1,5 +1,5 @@ Source: opencv4 -Version: 4.1.1-5 +Version: 4.1.1-6 Build-Depends: protobuf, zlib Homepage: https://github.com/opencv/opencv Description: computer vision library diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index 95c4c53dc..660a4e263 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -319,6 +319,7 @@ vcpkg_configure_cmake( ## Options from vcpkg_check_features() ${FEATURE_OPTIONS} -DHALIDE_ROOT_DIR=${CURRENT_INSTALLED_DIR} + -DCMAKE_DISABLE_FIND_PACKAGE_Halide=ON -DWITH_IPP=${WITH_IPP} -DWITH_MSMF=${WITH_MSMF} -DWITH_PROTOBUF=ON |