From ed7cfaadbe83cbb197e694f170ac1ab4dfa9dffb Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <mm@ucw.sh>
Date: Fri, 5 Jun 2020 14:59:22 +0200
Subject: [PATCH] [windows] Fix vcpkg_install_dir env, remove vcpkg_triplet env
---
windows/base/Dockerfile | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/windows/base/Dockerfile b/windows/base/Dockerfile
index bf2be3b..266f271 100644
--- a/windows/base/Dockerfile
+++ b/windows/base/Dockerfile
@@ -52,10 +52,9 @@ RUN $vcpkg_dir = 'C:/ProgramData/vcpkg'; \
./scripts/bootstrap.ps1 -disableMetrics; \
$vcpkg_target_triplet = 'x64-windows-14.16'; \
[Environment]::SetEnvironmentVariable('VCPKG_DIR', "\"$vcpkg_dir\"", [EnvironmentVariableTarget]::Machine); \
- [Environment]::SetEnvironmentVariable('VCPKG_TRIPLET', "\"$vcpkg_target_triplet\"", [EnvironmentVariableTarget]::Machine); \
[Environment]::SetEnvironmentVariable('VCPKG_TARGET_TRIPLET', "\"$vcpkg_target_triplet\"", [EnvironmentVariableTarget]::Machine); \
[Environment]::SetEnvironmentVariable('CMAKE_TOOLCHAIN_FILE', "\"$vcpkg_dir/scripts/buildsystems/vcpkg.cmake\"", [EnvironmentVariableTarget]::Machine); \
- [Environment]::SetEnvironmentVariable('VCPKG_INSTALL_DIR', "\"$vcpkg_dir/installed/$vcpkg_triplet\"", [EnvironmentVariableTarget]::Machine);
+ [Environment]::SetEnvironmentVariable('VCPKG_INSTALL_DIR', "\"$vcpkg_dir/installed/$vcpkg_target_triplet\"", [EnvironmentVariableTarget]::Machine);
ADD powershell/30-Vcpkg-CMake.ps1 /Windows/System32/WindowsPowerShell/v1.0/profile.d/30-Vcpkg-CMake.ps1
RUN cd $env:VCPKG_DIR; \
--
GitLab