Skip to content

fix presets expansion #4024

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 3 commits into from
Aug 29, 2024
Merged

fix presets expansion #4024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b55f312
fix presets expansion
gcampbell-msft Aug 29, 2024
1db0b55
missed a change
gcampbell-msft Aug 29, 2024
44ea137
update changelog
gcampbell-msft Aug 29, 2024
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
8 changes: 7 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
# What's New?

## 1.19
## 1.19.50

Bug Fixes:

- Fix env expansion of all variables (toolchainFile, etc.) in presets. [#4019](https://github.com/microsoft/vscode-cmake-tools/issues/4019)

## 1.19.49

Features:

Expand Down
6 changes: 3 additions & 3 deletions src/preset.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1284,7 +1284,7 @@ export async function expandConfigurePresetVariables(preset: ConfigurePreset, fo
}
}

expansionOpts.envOverride = expandedPreset.environment;
expansionOpts.envOverride = EnvironmentUtils.mergePreserveNull([env, expandedPreset.environment]);

if (preset.__file && preset.__file.version >= 3) {
// For presets v3+ binaryDir is optional, but cmake-tools needs a value. Default to something reasonable.
Expand Down Expand Up @@ -1659,7 +1659,7 @@ export async function expandBuildPresetVariables(preset: BuildPreset, name: stri
}
}

expansionOpts.envOverride = expandedPreset.environment;
expansionOpts.envOverride = EnvironmentUtils.mergePreserveNull([env, expandedPreset.environment]);

// Expand other fields
if (preset.targets) {
Expand Down Expand Up @@ -1834,7 +1834,7 @@ export async function expandTestPresetVariables(preset: TestPreset, name: string
}
}

expansionOpts.envOverride = expandedPreset.environment;
expansionOpts.envOverride = EnvironmentUtils.mergePreserveNull([env, expandedPreset.environment]);

// Expand other fields
if (preset.overwriteConfigurationFile) {
Expand Down
Loading