aboutsummaryrefslogtreecommitdiff
path: root/ports/opencv
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2017-11-11 12:30:05 -0800
committerGitHub <noreply@github.com>2017-11-11 12:30:05 -0800
commitd8ef6f95b44344be581748a448eec12d3fb91cde (patch)
treeca512b50d70c3786098ee303bce375044188e8d8 /ports/opencv
parentdcf5e8a770bd52b5589768556294031a867ba918 (diff)
parent72f10db01caf7dfa0e8c14c4256401b3f4ea70a2 (diff)
downloadvcpkg-d8ef6f95b44344be581748a448eec12d3fb91cde.tar.gz
vcpkg-d8ef6f95b44344be581748a448eec12d3fb91cde.zip
Merge pull request #2173 from lp55/master
Adding package features for Dlib and OpenCV
Diffstat (limited to 'ports/opencv')
-rw-r--r--ports/opencv/CONTROL4
-rw-r--r--ports/opencv/portfile.cmake6
2 files changed, 10 insertions, 0 deletions
diff --git a/ports/opencv/CONTROL b/ports/opencv/CONTROL
index 2654e5a25..d41323609 100644
--- a/ports/opencv/CONTROL
+++ b/ports/opencv/CONTROL
@@ -21,3 +21,7 @@ Description: Qt GUI support for opencv
Feature: vtk
Build-Depends: vtk
Description: vtk support for opencv
+
+Feature: gdcm
+Build-Depends: gdcm2
+Description: GDCM support for opencv
diff --git a/ports/opencv/portfile.cmake b/ports/opencv/portfile.cmake
index f514e189e..b6958abfd 100644
--- a/ports/opencv/portfile.cmake
+++ b/ports/opencv/portfile.cmake
@@ -58,6 +58,11 @@ if("vtk" IN_LIST FEATURES)
set(WITH_VTK ON)
endif()
+set(WITH_GDCM OFF)
+if("gdcm" IN_LIST FEATURES)
+ set(WITH_GDCM ON)
+endif()
+
set(WITH_MSMF ON)
if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
set(WITH_MSMF OFF)
@@ -112,6 +117,7 @@ vcpkg_configure_cmake(
-DWITH_OPENGL=ON
-DWITH_QT=${WITH_QT}
-DWITH_VTK=${WITH_VTK}
+ -DWITH_GDCM=${WITH_GDCM}
OPTIONS_DEBUG
-DINSTALL_HEADERS=OFF
-DINSTALL_OTHER=OFF