3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-16 21:38:12 +08:00
Code Issues Projects Releases Wiki Activity

Fix building feature opencv halide (#7581)

Browse Source 
* 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
This commit is contained in:
NiHoel 2019-08-17 02:16:18 +02:00 committed by Curtis J Bezault
parent 3ddfd132eb
commit de3d6b5c26
4 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/opencv3/CONTROL
View File

@ -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

1
ports/opencv3/portfile.cmake
View File

@ -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}

2
ports/opencv4/CONTROL
View File

@ -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

1
ports/opencv4/portfile.cmake
View File

@ -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