Skip to content

Preset includes should be loaded relative to the include'ing file #87

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
MarkSchofield merged 1 commit into from
Dec 24, 2025
Merged

Preset includes should be loaded relative to the include'ing file #87

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
34 changes: 20 additions & 14 deletions PSCMake/Common/CMake.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,17 +104,6 @@ function GetCMakePresets {

Write-Verbose "Processing CMakePresets: $IncludePath"

# Macro substiution for include paths
$IncludePath = MacroReplacement $IncludePath $null

if (-not (Test-Path -Path $IncludePath -PathType Leaf)) {
Write-Error "Included CMake presets file '$IncludePath' not found."
}

if ($IncludedFiles.Contains($IncludePath)) {
Write-Error "Cyclic include detected for included CMake presets file '$IncludePath'."
}

$IncludeJson = Get-Content $IncludePath | ConvertFrom-Json
if (-not $CMakePresetsJson) {
$CMakePresetsJson = $IncludeJson
Expand All @@ -123,10 +112,27 @@ function GetCMakePresets {
$CMakePresetsJson.configurePresets += Get-MemberValue -InputObject $IncludeJson -Name 'configurePresets' -Or @()
}

$IncludePaths += Get-MemberValue -InputObject $IncludeJson -Name 'include' -Or @()
$NestedIncludePaths = Get-MemberValue -InputObject $IncludeJson -Name 'include' -Or @()
$IncludeRoot = [System.IO.Path]::GetDirectoryName($IncludePath)
foreach ($NestedIncludePath in $NestedIncludePaths) {
# Macro substiution for include paths
$NestedIncludePath = MacroReplacement $NestedIncludePath $null

if (-not [System.IO.Path]::IsPathFullyQualified($NestedIncludePath)) {
$NestedIncludePath = Join-Path -Path $IncludeRoot -ChildPath $NestedIncludePath
}

if (-not (Test-Path -Path $NestedIncludePath -PathType Leaf)) {
Write-Error "Included CMake presets file '$NestedIncludePath' not found."
}

# Add to included files set
$IncludedFiles.Add($IncludePath) | Out-Null
if ($IncludedFiles.Contains($NestedIncludePath)) {
Write-Error "Cyclic include detected for included CMake presets file '$NestedIncludePath'."
}

$IncludedFiles.Add($NestedIncludePath) | Out-Null
$IncludePaths = $NestedIncludePath
}
}

$CMakePresetsJson
Expand Down