Skip to content
Snippets Groups Projects
Commit ecc602ed authored by calrama's avatar calrama
Browse files

[windows] readd compatibility VCPKG_TARGET_TRIPLET env var

parent 7277e24c
No related branches found
No related tags found
No related merge requests found
Checking pipeline status
...@@ -54,7 +54,8 @@ RUN $vcpkg_dir = 'C:/ProgramData/vcpkg'; \ ...@@ -54,7 +54,8 @@ RUN $vcpkg_dir = 'C:/ProgramData/vcpkg'; \
[Environment]::SetEnvironmentVariable('VCPKG_DIR', "\"$vcpkg_dir\"", [EnvironmentVariableTarget]::Machine); \ [Environment]::SetEnvironmentVariable('VCPKG_DIR', "\"$vcpkg_dir\"", [EnvironmentVariableTarget]::Machine); \
[Environment]::SetEnvironmentVariable('VCPKG_DEFAULT_TRIPLET', "\"$vcpkg_default_triplet\"", [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('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 ADD powershell/30-Vcpkg-CMake.ps1 /Windows/System32/WindowsPowerShell/v1.0/profile.d/30-Vcpkg-CMake.ps1
RUN cd $env:VCPKG_DIR; \ RUN cd $env:VCPKG_DIR; \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment