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

Add nonfree feature; Update version str

Browse Source
This commit is contained in:
Griffin Downs 2019-03-05 09:08:05 -08:00
parent 1908903508
commit 3d7f31224e
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ports/opencv/CONTROL
View File

@ -1,5 +1,5 @@
Source: opencv Source: opencv
Version: 3.4.3-6 Version: 3.4.3-7
Build-Depends: zlib Build-Depends: zlib
Description: computer vision library Description: computer vision library
Default-Features: opengl, jpeg, png, tiff, eigen, flann Default-Features: opengl, jpeg, png, tiff, eigen, flann
@ -80,3 +80,6 @@ Description: JPEG 2000 support for opencv
Feature: eigen Feature: eigen
Build-Depends: eigen3 Build-Depends: eigen3
Description: Eigen support for opencv Description: Eigen support for opencv
Feature: nonfree
Description: allow nonfree and unredistributable libraries

2
ports/opencv/portfile.cmake
View File

@ -283,7 +283,7 @@ vcpkg_configure_cmake(
# ENABLE # ENABLE
-DENABLE_CXX11=ON -DENABLE_CXX11=ON
-DENABLE_PYLINT=OFF -DENABLE_PYLINT=OFF
-DOPENCV_ENABLE_NONFREE=${OPENCV_ENABLE_NONFREE} -DOPENCV_ENABLE_NONFREE=${OPENCV_ENABLE_NONFREE}
# INSTALL # INSTALL
-DINSTALL_FORCE_UNIX_PATHS=ON -DINSTALL_FORCE_UNIX_PATHS=ON
-DINSTALL_LICENSE=OFF -DINSTALL_LICENSE=OFF