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

[windows] Fix vcpkg_install_dir env, remove vcpkg_triplet env

parent 735f1f0d
No related branches found
No related tags found
No related merge requests found
Pipeline #29149 passed
Stage: build
Stage: deploy
Stage: trigger
Pipeline: behavior_loader

#29152

    Pipeline: interfaces

    #29151

      Hide whitespace changes
      Inline Side-by-side
      Showing
      with 1 addition and 2 deletions
      windows/base/Dockerfile
      + 1
      − 2
      View file @ ed7cfaad
      ...@@ -52,10 +52,9 @@ RUN $vcpkg_dir = 'C:/ProgramData/vcpkg'; \ ...@@ -52,10 +52,9 @@ RUN $vcpkg_dir = 'C:/ProgramData/vcpkg'; \
      ./scripts/bootstrap.ps1 -disableMetrics; \ ./scripts/bootstrap.ps1 -disableMetrics; \
      $vcpkg_target_triplet = 'x64-windows-14.16'; \ $vcpkg_target_triplet = 'x64-windows-14.16'; \
      [Environment]::SetEnvironmentVariable('VCPKG_DIR', "\"$vcpkg_dir\"", [EnvironmentVariableTarget]::Machine); \ [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('VCPKG_TARGET_TRIPLET', "\"$vcpkg_target_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_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 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% or .
      You are about to add 0 people to the discussion. Proceed with caution.
      Please register or to comment