From 0a3cc50c41c2d74a0a39a409e22b3abb5881d271 Mon Sep 17 00:00:00 2001 From: huangqinjin Date: Thu, 11 Jun 2020 15:49:17 +0800 Subject: [opencv4] Fix linking halide (#11429) --- ports/opencv4/CONTROL | 2 +- ports/opencv4/portfile.cmake | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3