diff options
| author | Griffin Downs <35574547+grdowns@users.noreply.github.com> | 2019-03-11 14:00:34 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-11 14:00:34 -0700 |
| commit | 3a0e5304cf2f104ce2983b6b2b156a78f2c9be25 (patch) | |
| tree | 9834229038f2de1f5a25cc7eba2de3968d5db86c | |
| parent | 5862fba5ff99d933a8d9d3922a73a5582b8bc3ff (diff) | |
| parent | 3d7f31224ef0b22c7357cf05d526fdb2b3cfdb3d (diff) | |
| download | vcpkg-3a0e5304cf2f104ce2983b6b2b156a78f2c9be25.tar.gz vcpkg-3a0e5304cf2f104ce2983b6b2b156a78f2c9be25.zip | |
[opencv] add nonfree as feature for opencv (#4802)
* add nonfree as feature for opencv
* Add nonfree feature; Update version str
| -rw-r--r-- | ports/opencv/CONTROL | 5 | ||||
| -rw-r--r-- | ports/opencv/portfile.cmake | 6 |
2 files changed, 10 insertions, 1 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 49e42466a..7c6594e1b 100644 --- a/ports/opencv/portfile.cmake +++ b/ports/opencv/portfile.cmake @@ -212,6 +212,11 @@ if("eigen" IN_LIST FEATURES) set(WITH_EIGEN ON) endif() +set(OPENCV_ENABLE_NONFREE OFF) +if("nonfree" IN_LIST FEATURES) + set(OPENCV_ENABLE_NONFREE ON) +endif() + if(BUILD_opencv_contrib) vcpkg_from_github( OUT_SOURCE_PATH CONTRIB_SOURCE_PATH @@ -278,6 +283,7 @@ vcpkg_configure_cmake( # ENABLE -DENABLE_CXX11=ON -DENABLE_PYLINT=OFF + -DOPENCV_ENABLE_NONFREE=${OPENCV_ENABLE_NONFREE} # INSTALL -DINSTALL_FORCE_UNIX_PATHS=ON -DINSTALL_LICENSE=OFF |