aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2018-02-05 18:03:41 -0800
committerRobert Schumacher <roschuma@microsoft.com>2018-02-05 18:03:41 -0800
commitefedd6f299e07f2ddb49e3e2af6040431febf8dc (patch)
treed509bfe753c858e177eccd7d80597ec2007ca290
parentd385e296a6929bcf7e86eda925376e0cabce6fd4 (diff)
downloadvcpkg-efedd6f299e07f2ddb49e3e2af6040431febf8dc.tar.gz
vcpkg-efedd6f299e07f2ddb49e3e2af6040431febf8dc.zip
[opencv] Fixup -- apply patch added in previous commit
-rw-r--r--ports/opencv/CONTROL2
-rw-r--r--ports/opencv/portfile.cmake1
2 files changed, 2 insertions, 1 deletions
diff --git a/ports/opencv/CONTROL b/ports/opencv/CONTROL
index 13a24f0b4..11f1e8c69 100644
--- a/ports/opencv/CONTROL
+++ b/ports/opencv/CONTROL
@@ -1,5 +1,5 @@
Source: opencv
-Version: 3.4.0-1
+Version: 3.4.0-2
Build-Depends: zlib, libpng, libjpeg-turbo, tiff, protobuf (windows)
Description: computer vision library
diff --git a/ports/opencv/portfile.cmake b/ports/opencv/portfile.cmake
index 10bea9db2..d9d9d7344 100644
--- a/ports/opencv/portfile.cmake
+++ b/ports/opencv/portfile.cmake
@@ -15,6 +15,7 @@ vcpkg_apply_patches(
"${CMAKE_CURRENT_LIST_DIR}/002-fix-uwp.patch"
"${CMAKE_CURRENT_LIST_DIR}/no-double-expand-enable-pylint.patch"
"${CMAKE_CURRENT_LIST_DIR}/msvs-fix-2017-u5.patch"
+ "${CMAKE_CURRENT_LIST_DIR}/filesystem-uwp.patch"
)
file(REMOVE_RECURSE ${SOURCE_PATH}/3rdparty/libjpeg ${SOURCE_PATH}/3rdparty/libpng ${SOURCE_PATH}/3rdparty/zlib ${SOURCE_PATH}/3rdparty/libtiff)