diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-07-27 11:20:45 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-27 11:20:45 -0700 |
| commit | 59792e9e463d3781c7b95d96c49e24e1f9b7f154 (patch) | |
| tree | b838b7932f4471e5e9a13a87d96f129c4dafffaa | |
| parent | 17b6d75d0d16d8b620e6680c0364208aa8a52651 (diff) | |
| parent | af677d965e3c5b34f37304401736dff983c1d4fd (diff) | |
| download | vcpkg-59792e9e463d3781c7b95d96c49e24e1f9b7f154.tar.gz vcpkg-59792e9e463d3781c7b95d96c49e24e1f9b7f154.zip | |
Merge pull request #1499 from cloudhan/master
fix #1497
| -rw-r--r-- | ports/opencv/CONTROL | 2 | ||||
| -rw-r--r-- | ports/opencv/portfile.cmake | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/ports/opencv/CONTROL b/ports/opencv/CONTROL index 97f2017ee..7dbaf64c2 100644 --- a/ports/opencv/CONTROL +++ b/ports/opencv/CONTROL @@ -1,5 +1,5 @@ Source: opencv -Version: 3.2.0-2 +Version: 3.2.0-3 Build-Depends: zlib, libpng, libjpeg-turbo, tiff #Use the following line instead for optional features from OpenCV-contrib that require protobuf #Build-Depends: zlib, libpng, libjpeg-turbo, tiff, protobuf diff --git a/ports/opencv/portfile.cmake b/ports/opencv/portfile.cmake index b296e3658..3323fb0f4 100644 --- a/ports/opencv/portfile.cmake +++ b/ports/opencv/portfile.cmake @@ -42,7 +42,7 @@ vcpkg_configure_cmake( -DBUILD_PNG=OFF -DBUILD_opencv_python2=OFF -DBUILD_opencv_python3=OFF - -DBUILD_opencv_flann=OFF + -DBUILD_opencv_flann=ON -DBUILD_opencv_apps=OFF -DBUILD_DOCS=OFF -DBUILD_EXAMPLES=OFF @@ -60,7 +60,9 @@ vcpkg_configure_cmake( -DWITH_CUBLAS=OFF -DWITH_OPENCLAMDBLAS=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 #-DUPDATE_PROTO_FILES=ON OPTIONS_DEBUG |