diff --git a/CHANGELOG.md b/CHANGELOG.md index ec36d6660..b1b2c196d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,7 @@ Bug Fixes: - Ensure that tests are updated after a build. [#4148](https://github.com/microsoft/vscode-cmake-tools/pull/4148) - Fix various GCC compiler errors and GCC linker errors not showing up in Problems View [#2864](https://github.com/microsoft/vscode-cmake-tools/issues/2864) - Fix reloading presets when included files are changed or renamed and updated. [#3963](https://github.com/microsoft/vscode-cmake-tools/issues/3963) +- Fix parsing of CMakeUserPresets.json containing configure preset that is referenced in workflow preset. [#4202](https://github.com/microsoft/vscode-cmake-tools/pull/4202) ## 1.19.52 diff --git a/src/presets/preset.ts b/src/presets/preset.ts index 2fc3886dd..cea0b21b7 100644 --- a/src/presets/preset.ts +++ b/src/presets/preset.ts @@ -2196,6 +2196,9 @@ async function getWorkflowPresetInheritsHelper(folder: string, preset: WorkflowP errorHandler); } else { expandedConfigurePreset = getPresetByName(configurePresets(folder), workflowConfigurePreset); + if (!expandedConfigurePreset && allowUserPreset) { + expandedConfigurePreset = getPresetByName(userConfigurePresets(folder), workflowConfigurePreset); + } } if (!expandedConfigurePreset) { log.error(localize('configure.preset.not.found.full', 'Could not find configure preset with name {0}', workflowConfigurePreset));