aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2016-09-30 16:48:12 -0700
committerRobert Schumacher <roschuma@microsoft.com>2016-09-30 16:48:12 -0700
commit39c0c7152f78f67418f7a0f97fe77699e8ed2d58 (patch)
treede0ae6b3d6498fb574a96c4dc55eb0b161693d76
parent17786b865a9f004df391be69e8ad687d095f739b (diff)
downloadvcpkg-39c0c7152f78f67418f7a0f97fe77699e8ed2d58.tar.gz
vcpkg-39c0c7152f78f67418f7a0f97fe77699e8ed2d58.zip
[opencv] Require use of internal tiff, libjpeg, libpng. Partially fixes #81.
-rw-r--r--ports/opencv/CONTROL2
-rw-r--r--ports/opencv/portfile.cmake5
2 files changed, 6 insertions, 1 deletions
diff --git a/ports/opencv/CONTROL b/ports/opencv/CONTROL
index 94d36830f..74cf1d3bc 100644
--- a/ports/opencv/CONTROL
+++ b/ports/opencv/CONTROL
@@ -1,4 +1,4 @@
Source: opencv
Version: 3.1.0-1
-Build-Depends: zlib, libpng, libjpeg-turbo
+Build-Depends: zlib, libpng, libjpeg-turbo, tiff
Description: computer vision library
diff --git a/ports/opencv/portfile.cmake b/ports/opencv/portfile.cmake
index a40cc9e19..8842d6632 100644
--- a/ports/opencv/portfile.cmake
+++ b/ports/opencv/portfile.cmake
@@ -11,10 +11,15 @@ vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES "${CMAKE_CURRENT_LIST_DIR}/opencv-installation-options.patch"
)
+file(REMOVE_RECURSE ${SOURCE_PATH}/3rdparty/libjpeg ${SOURCE_PATH}/3rdparty/libpng ${SOURCE_PATH}/3rdparty/zlib ${SOURCE_PATH}/3rdparty/libtiff)
+
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
OPTIONS
-DBUILD_ZLIB=OFF
+ -DBUILD_TIFF=OFF
+ -DBUILD_JPEG=OFF
+ -DBUILD_PNG=OFF
-DINSTALL_CREATE_DISTRIB=ON
-DBUILD_opencv_python2=OFF
-DBUILD_opencv_python3=OFF