From d491eb656eb5d68fb496024afd9e6fae1d212ef6 Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <mm@ucw.sh>
Date: Mon, 2 Mar 2020 18:36:05 +0100
Subject: [PATCH] windows1809: Update OpenCV to 4
---
windows1809/base/Dockerfile | 2 +-
windows1809/cuda-devel/Dockerfile | 2 +-
windows1809/devel/Dockerfile | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/windows1809/base/Dockerfile b/windows1809/base/Dockerfile
index 7e355e1..e5c5be5 100644
--- a/windows1809/base/Dockerfile
+++ b/windows1809/base/Dockerfile
@@ -45,6 +45,6 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl
RUN $vcpkg_dir = 'C:/vcpkg'; \
git clone https://git.imp.fu-berlin.de/bioroboticslab/robofish/vcpkg.git $vcpkg_dir; \
cd $vcpkg_dir; \
- git checkout ed03d814da4c8edf09caba90c15741f13f436f9e; \
+ git checkout 7d322e995f49d3989fa982268c2d4586c4f8d1f1; \
./scripts/bootstrap.ps1; \
[Environment]::SetEnvironmentVariable('VCPKG_DIR', "\"$vcpkg_dir\"", [EnvironmentVariableTarget]::Machine);
diff --git a/windows1809/cuda-devel/Dockerfile b/windows1809/cuda-devel/Dockerfile
index b953efb..80e199d 100644
--- a/windows1809/cuda-devel/Dockerfile
+++ b/windows1809/cuda-devel/Dockerfile
@@ -34,7 +34,7 @@ RUN cd $env:VCPKG_DIR; \
harfbuzz \
rpclib \
eigen3 \
- "\"opencv3[cuda,ffmpeg,ximea,opengl,contrib,ipp,dnn]\"" \
+ "\"opencv4[cuda,ffmpeg,ximea,opengl,contrib,ipp,dnn]\"" \
"\"mxnet[cpp,opencv,cuda,cudnn]\""; \
[Environment]::SetEnvironmentVariable('VCPKG_TRIPLET', "\"$vcpkg_triplet\"", [EnvironmentVariableTarget]::Machine); \
[Environment]::SetEnvironmentVariable('CMAKE_TOOLCHAIN_FILE', "\"/vcpkg/scripts/buildsystems/vcpkg.cmake\"", [EnvironmentVariableTarget]::Machine); \
diff --git a/windows1809/devel/Dockerfile b/windows1809/devel/Dockerfile
index 36e7e26..7d7b0e0 100644
--- a/windows1809/devel/Dockerfile
+++ b/windows1809/devel/Dockerfile
@@ -23,7 +23,7 @@ RUN cd $env:VCPKG_DIR; \
harfbuzz \
rpclib \
eigen3 \
- "\"opencv3[ffmpeg,ximea,opengl,contrib,ipp,dnn]\"" \
+ "\"opencv4[ffmpeg,ximea,opengl,contrib,ipp,dnn]\"" \
"\"mxnet[cpp,opencv]\""; \
[Environment]::SetEnvironmentVariable('VCPKG_TRIPLET', "\"$vcpkg_triplet\"", [EnvironmentVariableTarget]::Machine); \
[Environment]::SetEnvironmentVariable('CMAKE_TOOLCHAIN_FILE', "\"/vcpkg/scripts/buildsystems/vcpkg.cmake\"", [EnvironmentVariableTarget]::Machine); \
--
GitLab