aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJackBoosY <47264268+JackBoosY@users.noreply.github.com>2019-08-28 05:09:02 +0800
committerCurtis J Bezault <curtbezault@gmail.com>2019-08-27 14:09:02 -0700
commit3b2bd689ed7975214219b433b7564375a01e3720 (patch)
tree0017e6a6c87ad8e85a150f5e64954e7dccb9f5b8
parent6f7ef0f142a86c3cc99d59aab090b05bd18ae156 (diff)
downloadvcpkg-3b2bd689ed7975214219b433b7564375a01e3720.tar.gz
vcpkg-3b2bd689ed7975214219b433b7564375a01e3720.zip
[opencv3]Add feature option ${FEATURE_OPTIONS} to vcpkg_configure_cmake. (#7925)
-rw-r--r--ports/opencv3/CONTROL2
-rw-r--r--ports/opencv3/portfile.cmake2
2 files changed, 2 insertions, 2 deletions
diff --git a/ports/opencv3/CONTROL b/ports/opencv3/CONTROL
index d564e24a8..16776381d 100644
--- a/ports/opencv3/CONTROL
+++ b/ports/opencv3/CONTROL
@@ -1,5 +1,5 @@
Source: opencv3
-Version: 3.4.7
+Version: 3.4.7-1
Build-Depends: protobuf, zlib
Homepage: https://github.com/opencv/opencv
Description: computer vision library
diff --git a/ports/opencv3/portfile.cmake b/ports/opencv3/portfile.cmake
index f7ef27973..9f1e4788d 100644
--- a/ports/opencv3/portfile.cmake
+++ b/ports/opencv3/portfile.cmake
@@ -204,7 +204,7 @@ endif()
vcpkg_configure_cmake(
PREFER_NINJA
SOURCE_PATH ${SOURCE_PATH}
- OPTIONS
+ OPTIONS ${FEATURE_OPTIONS}
###### ocv_options
-DOpenCV_INSTALL_BINARIES_PREFIX=
-DOPENCV_LIB_INSTALL_PATH=lib