Skip to content

Commit

Permalink
fix(collect/cmake): collect did not compile correctly with the new vc…
Browse files Browse the repository at this point in the history
…pkg (#1645)

REFS: MON-147095
  • Loading branch information
bouda1 committed Aug 27, 2024
1 parent ec42b96 commit 3b6f48f
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/scripts/windows-agent-compile.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ if ( $? -ne $true ) {

[System.Environment]::SetEnvironmentVariable("VCPKG_ROOT",$pwd.ToString()+"\vcpkg")
[System.Environment]::SetEnvironmentVariable("PATH",$pwd.ToString()+"\vcpkg;" + $env:PATH)

Write-Host "compile vcpkg dependencies"
vcpkg install --vcpkg-root $env:VCPKG_ROOT --x-install-root build_windows\vcpkg_installed --x-manifest-root . --overlay-triplets custom-triplets --triplet x64-windows

Write-Host "Compress binary archive"
7z a $file_name_extension build_windows\vcpkg_installed
Write-Host "Upload binary archive"
Expand Down
2 changes: 1 addition & 1 deletion cmake-vcpkg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ fi

if [ ! -d vcpkg ] ; then
echo "No vcpkg directory. Cloning the repo"
git clone --depth 1 --single-branch --no-tags https://github.com/Microsoft/vcpkg.git
git clone --depth 1 -b 2024.01.12 https://github.com/Microsoft/vcpkg.git
./vcpkg/bootstrap-vcpkg.sh
fi

Expand Down
2 changes: 1 addition & 1 deletion vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,4 @@
"platform": "linux"
}
]
}
}

0 comments on commit 3b6f48f

Please sign in to comment.