diff options
| author | Griffin Downs <grdowns@microsoft.com> | 2019-03-05 09:08:05 -0800 |
|---|---|---|
| committer | Griffin Downs <grdowns@microsoft.com> | 2019-03-05 09:08:05 -0800 |
| commit | 3d7f31224ef0b22c7357cf05d526fdb2b3cfdb3d (patch) | |
| tree | f41fb8effece416e42276ad5980c55d68581affe /ports/opencv | |
| parent | 1908903508bf057ad05d8a344e5bc55477944cb6 (diff) | |
| download | vcpkg-3d7f31224ef0b22c7357cf05d526fdb2b3cfdb3d.tar.gz vcpkg-3d7f31224ef0b22c7357cf05d526fdb2b3cfdb3d.zip | |
Add nonfree feature; Update version str
Diffstat (limited to 'ports/opencv')
| -rw-r--r-- | ports/opencv/CONTROL | 5 | ||||
| -rw-r--r-- | ports/opencv/portfile.cmake | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/ports/opencv/CONTROL b/ports/opencv/CONTROL index 03328915d..88ade6e28 100644 --- a/ports/opencv/CONTROL +++ b/ports/opencv/CONTROL @@ -1,5 +1,5 @@ Source: opencv -Version: 3.4.3-6 +Version: 3.4.3-7 Build-Depends: zlib Description: computer vision library Default-Features: opengl, jpeg, png, tiff, eigen, flann @@ -80,3 +80,6 @@ Description: JPEG 2000 support for opencv Feature: eigen Build-Depends: eigen3 Description: Eigen support for opencv + +Feature: nonfree +Description: allow nonfree and unredistributable libraries diff --git a/ports/opencv/portfile.cmake b/ports/opencv/portfile.cmake index 5bafe84ba..7c6594e1b 100644 --- a/ports/opencv/portfile.cmake +++ b/ports/opencv/portfile.cmake @@ -283,7 +283,7 @@ vcpkg_configure_cmake( # ENABLE -DENABLE_CXX11=ON -DENABLE_PYLINT=OFF - -DOPENCV_ENABLE_NONFREE=${OPENCV_ENABLE_NONFREE} + -DOPENCV_ENABLE_NONFREE=${OPENCV_ENABLE_NONFREE} # INSTALL -DINSTALL_FORCE_UNIX_PATHS=ON -DINSTALL_LICENSE=OFF |