From df4d0cf8d44b3178abb5fdc290194de419954a79 Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <moritz@ucworks.org>
Date: Tue, 18 Sep 2018 01:41:16 +0200
Subject: [PATCH] Use VS 14.13, enable cuda,ximea,ffmpeg for opencv, enable
cuda for mxnet
---
windows/Dockerfile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/windows/Dockerfile b/windows/Dockerfile
index feaddeb..ac5b903 100644
--- a/windows/Dockerfile
+++ b/windows/Dockerfile
@@ -49,7 +49,7 @@ RUN $vcpkg_dir = 'C:/vcpkg'; \
[Environment]::SetEnvironmentVariable('VCPKG_DIR', "\"$vcpkg_dir\"", [EnvironmentVariableTarget]::Machine);
RUN cd $Env:VCPKG_DIR; \
- $vcpkg_triplet = 'x64-windows'; \
+ $vcpkg_triplet = 'x64-windows-14.13'; \
./vcpkg install \
zlib:$vcpkg_triplet \
libepoxy[egl]:$vcpkg_triplet \
@@ -58,8 +58,8 @@ RUN cd $Env:VCPKG_DIR; \
hdf5:$vcpkg_triplet \
openblas:$vcpkg_triplet \
pybind11:$vcpkg_triplet; \
- ./vcpkg install opencv:$vcpkg_triplet; \
- ./vcpkg install mxnet[cpp,opencv]:$vcpkg_triplet; \
+ ./vcpkg install opencv[ffmpeg,ximea,cuda]:$vcpkg_triplet; \
+ ./vcpkg install mxnet[cpp,opencv,cuda]:$vcpkg_triplet; \
Copy-Item ./downloads/tools/flang/5.0.0/Library/bin/flang.dll ./installed/$vcpkg_triplet/bin/; \
Copy-Item ./downloads/tools/flang/5.0.0/Library/bin/flangrti.dll ./installed/$vcpkg_triplet/bin/; \
Copy-Item ./downloads/tools/flang/5.0.0/Library/bin/libomp.dll ./installed/$vcpkg_triplet/bin/; \
--
GitLab