Skip to content

Windows: Use pre-installed CMake and Ninja #80918

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

Merged
merged 1 commit into from
Apr 19, 2025
Merged

Windows: Use pre-installed CMake and Ninja #80918

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
52 changes: 35 additions & 17 deletions utils/build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,31 @@ $vswhere = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.e
$VSInstallRoot = & $vswhere -nologo -latest -products "*" -all -prerelease -property installationPath
$msbuild = "$VSInstallRoot\MSBuild\Current\Bin\$BuildArchName\MSBuild.exe"

function Get-CMake {
try {
return (Get-Command "cmake.exe" -ErrorAction Stop).Source
} catch {
if (Test-Path -Path "${VSInstallRoot}\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin" -PathType Container) {
return "${VSInstallRoot}\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe"
}
}
throw "CMake not found on Path nor in the Visual Studio Installation. Please Install CMake to continue."
}

function Get-Ninja {
try {
return (Get-Command "Ninja.exe" -ErrorAction Stop).Source
} catch {
if (Test-Path -Path "${VSInstallRoot}\Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja" -PathType Container) {
return "${VSInstallRoot}\Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja\ninja.exe"
}
}
throw "Ninja not found on Path nor in the Visual Studio Installation. Please Install Ninja to continue."
}

$cmake = Get-CMake
$ninja = Get-Ninja

$NugetRoot = "$BinaryCache\nuget"
$LibraryRoot = "$ImageRoot\Library"

Expand Down Expand Up @@ -1222,14 +1247,6 @@ function Build-CMakeProject {
}

if ($Platform.OS -eq [OS]::Android) {
$vswhere = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe"
$VSInstallPath = & $vswhere -nologo -latest -products * -property installationPath
if (Test-Path "${VSInstallPath}\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin") {
$env:Path = "${VSInstallPath}\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin;${VSInstallPath}\Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja;${env:Path}"
Add-KeyValueIfNew $Defines CMAKE_MAKE_PROGRAM "${VSInstallPath}\Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja\ninja.exe"
} else {
throw "Missing CMake and Ninja in the visual studio installation that are needed to build Android"
}
$androidNDKPath = Get-AndroidNDKPath
Add-KeyValueIfNew $Defines CMAKE_C_COMPILER (Join-Path -Path $androidNDKPath -ChildPath "toolchains\llvm\prebuilt\windows-x86_64\bin\clang.exe")
Add-KeyValueIfNew $Defines CMAKE_CXX_COMPILER (Join-Path -Path $androidNDKPath -ChildPath "toolchains\llvm\prebuilt\windows-x86_64\bin\clang++.exe")
Expand Down Expand Up @@ -1428,6 +1445,8 @@ function Build-CMakeProject {
Add-KeyValueIfNew $Defines CMAKE_INSTALL_PREFIX $InstallTo
}

Add-KeyValueIfNew $Defines CMAKE_MAKE_PROGRAM "$ninja"

# Generate the project
$cmakeGenerateArgs = @("-B", $Bin, "-S", $Src, "-G", $Generator)
if ($CacheScript) {
Expand Down Expand Up @@ -1467,26 +1486,25 @@ function Build-CMakeProject {
} elseif ($UsePinnedCompilers.Contains("Swift")) {
$env:Path = "$(Get-PinnedToolchainRuntime);${env:Path}"
}

if ($ToBatch) {
Write-Output ""
Write-Output "echo cmake.exe $cmakeGenerateArgs"
Write-Output "echo $cmake $cmakeGenerateArgs"
} else {
Write-Host "cmake.exe $cmakeGenerateArgs"
Write-Host "$cmake $cmakeGenerateArgs"
}
Invoke-Program cmake.exe @cmakeGenerateArgs
Invoke-Program $cmake @cmakeGenerateArgs

# Build all requested targets
foreach ($Target in $BuildTargets) {
if ($Target -eq "default") {
Invoke-Program cmake.exe --build $Bin
Invoke-Program $cmake --build $Bin
} else {
Invoke-Program cmake.exe --build $Bin --target $Target
Invoke-Program $cmake --build $Bin --target $Target
}
}

if ($BuildTargets.Length -eq 0 -and $InstallTo) {
Invoke-Program cmake.exe --build $Bin --target install
Invoke-Program $cmake --build $Bin --target install
}
}

Expand Down Expand Up @@ -2270,7 +2288,7 @@ function Build-ExperimentalRuntime {
Invoke-VsDevShell $BuildPlatform

Push-Location "${SourceCache}\swift\Runtimes"
Start-Process -Wait -WindowStyle Hidden -FilePath cmake.exe -ArgumentList @("-P", "Resync.cmake")
Start-Process -Wait -WindowStyle Hidden -FilePath $cmake -ArgumentList @("-P", "Resync.cmake")
Pop-Location
}

Expand Down Expand Up @@ -2681,7 +2699,7 @@ function Test-LLBuild {
# Build additional llvm executables needed by tests
Invoke-IsolatingEnvVars {
Invoke-VsDevShell $BuildPlatform
Invoke-Program ninja.exe -C (Get-ProjectBinaryCache $BuildPlatform BuildTools) FileCheck not
Invoke-Program $ninja -C (Get-ProjectBinaryCache $BuildPlatform BuildTools) FileCheck not
}

Invoke-IsolatingEnvVars {
Expand Down