diff options
| author | NiHoel <s1nihoel@uni-bayreuth.de> | 2019-08-17 02:16:18 +0200 |
|---|---|---|
| committer | Curtis J Bezault <curtbezault@gmail.com> | 2019-08-16 17:16:17 -0700 |
| commit | de3d6b5c26d2e8274297e101ba23a45fea35512a (patch) | |
| tree | 1ca0b376386127f16a06477560adf933081282a1 | |
| parent | 3ddfd132ebc3b5bdc76fea5dfdcae57ae0e3b7ba (diff) | |
| download | vcpkg-de3d6b5c26d2e8274297e101ba23a45fea35512a.tar.gz vcpkg-de3d6b5c26d2e8274297e101ba23a45fea35512a.zip | |
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
| -rw-r--r-- | ports/opencv3/CONTROL | 2 | ||||
| -rw-r--r-- | ports/opencv3/portfile.cmake | 1 | ||||
| -rw-r--r-- | ports/opencv4/CONTROL | 2 | ||||
| -rw-r--r-- | ports/opencv4/portfile.cmake | 1 |
4 files changed, 4 insertions, 2 deletions
diff --git a/ports/opencv3/CONTROL b/ports/opencv3/CONTROL index 5f65d9e43..f70d1d387 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 12c4dadae..e4745d336 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 ca52577c7..e16540656 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 efafab614..ed0b9f1e2 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 |