From fae0fea9db1de37bdb5c7ef4e63b0618b023804a Mon Sep 17 00:00:00 2001 From: Moritz Maxeiner <mm@ucw.sh> Date: Wed, 11 Dec 2019 12:06:56 +0100 Subject: [PATCH] windows: Add VCPKG_TARGET_TRIPLE environmental variable --- windows1809/cuda-devel/Dockerfile | 1 + windows1809/devel/Dockerfile | 1 + 2 files changed, 2 insertions(+) diff --git a/windows1809/cuda-devel/Dockerfile b/windows1809/cuda-devel/Dockerfile index ce5e06a..a9707a4 100644 --- a/windows1809/cuda-devel/Dockerfile +++ b/windows1809/cuda-devel/Dockerfile @@ -37,6 +37,7 @@ RUN cd $env:VCPKG_DIR; \ "\"opencv3[cuda,ffmpeg,ximea,opengl,contrib,ipp,dnn]\"" \ "\"mxnet[cpp,opencv,cuda,cudnn]\""; \ [Environment]::SetEnvironmentVariable('VCPKG_TRIPLET', "\"$vcpkg_triplet\"", [EnvironmentVariableTarget]::Machine); \ + [Environment]::SetEnvironmentVariable('VCPKG_TARGET_TRIPLET', "\"$vcpkg_triplet\"", [EnvironmentVariableTarget]::Machine); \ [Environment]::SetEnvironmentVariable('VCPKG_INSTALL_DIR', "\"$env:VCPKG_DIR/installed/$vcpkg_triplet\"", [EnvironmentVariableTarget]::Machine); \ Remove-Item -Force -Recurse ./downloads; \ Remove-Item -Force -Recurse ./buildtrees; \ diff --git a/windows1809/devel/Dockerfile b/windows1809/devel/Dockerfile index a254705..de72000 100644 --- a/windows1809/devel/Dockerfile +++ b/windows1809/devel/Dockerfile @@ -26,6 +26,7 @@ RUN cd $env:VCPKG_DIR; \ "\"opencv3[ffmpeg,ximea,opengl,contrib,ipp,dnn]\"" \ "\"mxnet[cpp,opencv]\""; \ [Environment]::SetEnvironmentVariable('VCPKG_TRIPLET', "\"$vcpkg_triplet\"", [EnvironmentVariableTarget]::Machine); \ + [Environment]::SetEnvironmentVariable('VCPKG_TARGET_TRIPLET', "\"$vcpkg_triplet\"", [EnvironmentVariableTarget]::Machine); \ [Environment]::SetEnvironmentVariable('VCPKG_INSTALL_DIR', "\"$env:VCPKG_DIR/installed/$vcpkg_triplet\"", [EnvironmentVariableTarget]::Machine); \ Remove-Item -Force -Recurse ./downloads; \ Remove-Item -Force -Recurse ./buildtrees; \ -- GitLab