Skip to content

fix: use ninja downloaded by vcpkg #15677

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jinseopkim0 wants to merge 1 commit into from
Closed

fix: use ninja downloaded by vcpkg #15677

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions ci/kokoro/windows/builds/cmake.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,18 @@ if ($missing.count -ge 1) {

$project_root = (Get-Item -Path ".\" -Verbose).FullName -replace "\\", "/"
$vcpkg_root = Install-Vcpkg "${project_root}" ""

# Force the build to use the version of Ninja downloaded by vcpkg. This
# works around a problem where the version of Ninja bundled with Visual
# Studio is found first, but fails to run correctly.
$ninja_dir = (Get-ChildItem -Path "${vcpkg_root}/downloads/tools" -Recurse -Directory -Filter "ninja-*-windows").FullName | Select-Object -First 1
if ($ninja_dir) {
Write-Host "Found vcpkg ninja at ${ninja_dir}. Prepending to PATH."
$env:PATH = "${ninja_dir};${env:PATH}"
} else {
Write-Host -ForegroundColor Yellow "Could not find vcpkg-downloaded ninja, relying on PATH."
}

$binary_dir="cmake-out/${BuildName}"
# Install all dependencies from the vcpkg.json manifest file.
# This mirrors the behavior of our GHA builds.
Expand Down
Loading