mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-25 22:29:08 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1499 from cloudhan/master

Browse Source 
fix #1497
This commit is contained in:
Robert Schumacher 2017-07-27 11:20:45 -07:00 committed by GitHub
commit 59792e9e46
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/opencv/CONTROL
View File

@ -1,5 +1,5 @@
Source: opencv Source: opencv
Version: 3.2.0-2 Version: 3.2.0-3
Build-Depends: zlib, libpng, libjpeg-turbo, tiff Build-Depends: zlib, libpng, libjpeg-turbo, tiff
#Use the following line instead for optional features from OpenCV-contrib that require protobuf #Use the following line instead for optional features from OpenCV-contrib that require protobuf
#Build-Depends: zlib, libpng, libjpeg-turbo, tiff, protobuf #Build-Depends: zlib, libpng, libjpeg-turbo, tiff, protobuf

6
ports/opencv/portfile.cmake
View File

@ -42,7 +42,7 @@ vcpkg_configure_cmake(
-DBUILD_PNG=OFF -DBUILD_PNG=OFF
-DBUILD_opencv_python2=OFF -DBUILD_opencv_python2=OFF
-DBUILD_opencv_python3=OFF -DBUILD_opencv_python3=OFF
-DBUILD_opencv_flann=OFF -DBUILD_opencv_flann=ON
-DBUILD_opencv_apps=OFF -DBUILD_opencv_apps=OFF
-DBUILD_DOCS=OFF -DBUILD_DOCS=OFF
-DBUILD_EXAMPLES=OFF -DBUILD_EXAMPLES=OFF
@ -60,7 +60,9 @@ vcpkg_configure_cmake(
-DWITH_CUBLAS=OFF -DWITH_CUBLAS=OFF
-DWITH_OPENCLAMDBLAS=OFF -DWITH_OPENCLAMDBLAS=OFF
-DWITH_LAPACK=OFF -DWITH_LAPACK=OFF
#-DOPENCV_EXTRA_MODULES_PATH=${CONTRIB_SOURCE_PATH}/modules # uncomment the following 3 lines to build opencv_contrib modules
# uncomment the following 3 lines to build opencv_contrib modules
#-DOPENCV_EXTRA_MODULES_PATH=${CONTRIB_SOURCE_PATH}/modules
#-DBUILD_PROTOBUF=OFF #-DBUILD_PROTOBUF=OFF
#-DUPDATE_PROTO_FILES=ON #-DUPDATE_PROTO_FILES=ON
OPTIONS_DEBUG OPTIONS_DEBUG