aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2017-07-11 14:39:32 -0700
committerRobert Schumacher <roschuma@microsoft.com>2017-07-11 14:39:32 -0700
commit1a84896b87061943f6965638dfb5e7725c7f6695 (patch)
treeb83c99510125595813a5aa74f5de83237f35e0a5
parent5498864711a2c7b1224e2ebfeff0269d591a2136 (diff)
downloadvcpkg-1a84896b87061943f6965638dfb5e7725c7f6695.tar.gz
vcpkg-1a84896b87061943f6965638dfb5e7725c7f6695.zip
[opencv] Disable FLANN hidden dependency. Fixes #1433.
-rw-r--r--ports/opencv/CONTROL2
-rw-r--r--ports/opencv/portfile.cmake1
2 files changed, 2 insertions, 1 deletions
diff --git a/ports/opencv/CONTROL b/ports/opencv/CONTROL
index 8da12f3d9..97f2017ee 100644
--- a/ports/opencv/CONTROL
+++ b/ports/opencv/CONTROL
@@ -1,5 +1,5 @@
Source: opencv
-Version: 3.2.0-1
+Version: 3.2.0-2
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 c72eefba1..b296e3658 100644
--- a/ports/opencv/portfile.cmake
+++ b/ports/opencv/portfile.cmake
@@ -42,6 +42,7 @@ vcpkg_configure_cmake(
-DBUILD_PNG=OFF
-DBUILD_opencv_python2=OFF
-DBUILD_opencv_python3=OFF
+ -DBUILD_opencv_flann=OFF
-DBUILD_opencv_apps=OFF
-DBUILD_DOCS=OFF
-DBUILD_EXAMPLES=OFF