From ecc602edb5abd8801dbcf5aa4df342737c795e60 Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <mm@ucw.sh>
Date: Tue, 14 Sep 2021 19:34:47 +0200
Subject: [PATCH] [windows] readd compatibility VCPKG_TARGET_TRIPLET env var
---
windows/base/Dockerfile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/windows/base/Dockerfile b/windows/base/Dockerfile
index 00cb758..2acbe16 100644
--- a/windows/base/Dockerfile
+++ b/windows/base/Dockerfile
@@ -54,7 +54,8 @@ RUN $vcpkg_dir = 'C:/ProgramData/vcpkg'; \
[Environment]::SetEnvironmentVariable('VCPKG_DIR', "\"$vcpkg_dir\"", [EnvironmentVariableTarget]::Machine); \
[Environment]::SetEnvironmentVariable('VCPKG_DEFAULT_TRIPLET', "\"$vcpkg_default_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_default_triplet\"", [EnvironmentVariableTarget]::Machine);
+ [Environment]::SetEnvironmentVariable('VCPKG_INSTALL_DIR', "\"$vcpkg_dir/installed/$vcpkg_default_triplet\"", [EnvironmentVariableTarget]::Machine); \
+ [Environment]::SetEnvironmentVariable('VCPKG_TARGET_TRIPLET', "\"$vcpkg_default_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