From de3d6b5c26d2e8274297e101ba23a45fea35512a Mon Sep 17 00:00:00 2001 From: NiHoel Date: Sat, 17 Aug 2019 02:16:18 +0200 Subject: [PATCH] Fix building feature opencv halide (#7581) * Add feature halide to OpenCV. * Add dependency of opencv[halide] to opencv[dnn]. * Fix building opencv[halide]. * Only require opencv[dnn] not default features. * Migration to opencv4 port. * [opencv] Normalize line endings in CONTROL file * [opencv] Normalize line endings in CONTROL file --- ports/opencv3/CONTROL | 2 +- ports/opencv3/portfile.cmake | 1 + ports/opencv4/CONTROL | 2 +- ports/opencv4/portfile.cmake | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ports/opencv3/CONTROL b/ports/opencv3/CONTROL index 5f65d9e437..f70d1d3877 100644 --- a/ports/opencv3/CONTROL +++ b/ports/opencv3/CONTROL @@ -83,7 +83,7 @@ Build-Depends: eigen3 Description: Eigen support for opencv Feature: halide -Build-Depends: halide, opencv3[dnn] +Build-Depends: halide, opencv3[core], opencv3[dnn] Description: Halide support for opencv Feature: world diff --git a/ports/opencv3/portfile.cmake b/ports/opencv3/portfile.cmake index 12c4dadaec..e4745d3362 100644 --- a/ports/opencv3/portfile.cmake +++ b/ports/opencv3/portfile.cmake @@ -316,6 +316,7 @@ vcpkg_configure_cmake( -DWITH_FFMPEG=${WITH_FFMPEG} -DWITH_GDCM=${WITH_GDCM} -DWITH_HALIDE=${WITH_HALIDE} + -DHALIDE_ROOT_DIR=${CURRENT_INSTALLED_DIR} -DWITH_IPP=${WITH_IPP} -DWITH_JASPER=${WITH_JASPER} -DWITH_JPEG=${WITH_JPEG} diff --git a/ports/opencv4/CONTROL b/ports/opencv4/CONTROL index ca52577c74..e165406569 100644 --- a/ports/opencv4/CONTROL +++ b/ports/opencv4/CONTROL @@ -89,7 +89,7 @@ Build-Depends: libwebp Description: WebP support for opencv Feature: halide -Build-Depends: halide, opencv4[dnn] +Build-Depends: halide, opencv4[core], opencv4[dnn] Description: Halide support for opencv Feature: world diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index efafab6146..ed0b9f1e21 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -305,6 +305,7 @@ vcpkg_configure_cmake( ###### customized properties ## Options from vcpkg_check_features() ${FEATURE_OPTIONS} + -DHALIDE_ROOT_DIR=${CURRENT_INSTALLED_DIR} -DWITH_IPP=${WITH_IPP} -DWITH_MSMF=${WITH_MSMF} -DWITH_PROTOBUF=ON