From c6b58435190778b33ec7a0de702071857727f16a Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <moritz@ucworks.org>
Date: Sat, 15 Sep 2018 22:38:02 +0200
Subject: [PATCH] Expose triplet as well
---
windows/Dockerfile | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/windows/Dockerfile b/windows/Dockerfile
index d3e5367..6151f76 100644
--- a/windows/Dockerfile
+++ b/windows/Dockerfile
@@ -38,21 +38,22 @@ RUN $vcpkg_dir = 'C:/vcpkg'; \
[Environment]::SetEnvironmentVariable('VCPKG_DIR', "\"$vcpkg_dir\"", [EnvironmentVariableTarget]::Machine);
RUN cd $Env:VCPKG_DIR; \
- $vcpkg_triple = x64-windows; \
+ $vcpkg_triplet = x64-windows; \
./vcpkg install \
- zlib:$vcpkg_triple \
- libepoxy[egl]:$vcpkg_triple \
- glm:$vcpkg_triple \
- cgal:$vcpkg_triple \
- hdf5:$vcpkg_triple \
- openblas:$vcpkg_triple \
- pybind11:$vcpkg_triple; \
- ./vcpkg install opencv:$vcpkg_triple; \
- ./vcpkg install mxnet[cpp,opencv]:$vcpkg_triple; \
+ zlib:$vcpkg_triplet \
+ libepoxy[egl]:$vcpkg_triplet \
+ glm:$vcpkg_triplet \
+ cgal:$vcpkg_triplet \
+ hdf5:$vcpkg_triplet \
+ openblas:$vcpkg_triplet \
+ pybind11:$vcpkg_triplet; \
+ ./vcpkg install opencv:$vcpkg_triplet; \
+ ./vcpkg install mxnet[cpp,opencv]:$vcpkg_triplet; \
Remove-Item -Recurse -Force -Path ./downloads; \
Remove-Item -Recurse -Force -Path ./buildtrees; \
Remove-Item -Recurse -Force -Path ./packages; \
- [Environment]::SetEnvironmentVariable('VCPKG_INSTALL_DIR', "\"$Env:VCPKG_DIR/installed/$vcpkg_triple\"", [EnvironmentVariableTarget]::Machine);
+ [Environment]::SetEnvironmentVariable('VCPKG_TRIPLET', "\"$vcpkg_triplet\"", [EnvironmentVariableTarget]::Machine); \
+ [Environment]::SetEnvironmentVariable('VCPKG_INSTALL_DIR', "\"$Env:VCPKG_DIR/installed/$vcpkg_triplet\"", [EnvironmentVariableTarget]::Machine);
RUN python -m pip --no-cache-dir install --no-warn-script-location \
numpy \
--
GitLab