diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2016-09-30 16:49:47 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2016-09-30 16:49:47 -0700 |
| commit | d31498d0e7c22251b22594763d91c9f36a32629a (patch) | |
| tree | 5e198a4e3d7997b7bd8078bf9840571cd614eb90 /ports | |
| parent | 8becbe15a2a7f229041b70d0333ffc96522efb6f (diff) | |
| parent | cddc4f612ee605788928dafcb6366c6478fdb401 (diff) | |
| download | vcpkg-d31498d0e7c22251b22594763d91c9f36a32629a.tar.gz vcpkg-d31498d0e7c22251b22594763d91c9f36a32629a.zip | |
Merge branch 'master' of https://github.com/Microsoft/vcpkg
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/opencv/CONTROL | 2 | ||||
| -rw-r--r-- | ports/opencv/portfile.cmake | 5 |
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 |