From 97718fb49163f93b6f8e8044704ffb3c558bbdbb Mon Sep 17 00:00:00 2001 From: Cloud Han Date: Mon, 24 Jul 2017 01:27:56 +0800 Subject: fix #1497 --- ports/opencv/portfile.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/opencv/portfile.cmake b/ports/opencv/portfile.cmake index b296e3658..c72eefba1 100644 --- a/ports/opencv/portfile.cmake +++ b/ports/opencv/portfile.cmake @@ -42,7 +42,6 @@ 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 -- cgit v1.2.3 From af677d965e3c5b34f37304401736dff983c1d4fd Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Thu, 27 Jul 2017 11:20:20 -0700 Subject: [opencv] Bump version to match flann change. --- ports/opencv/CONTROL | 2 +- ports/opencv/portfile.cmake | 5 ++++- 2 files changed, 5 insertions(+), 2 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 c72eefba1..3323fb0f4 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=ON -DBUILD_opencv_apps=OFF -DBUILD_DOCS=OFF -DBUILD_EXAMPLES=OFF @@ -59,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 -- cgit v1.2.3