diff options
| author | Brad King <brad.king@kitware.com> | 2022-01-24 16:46:15 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-01-24 16:46:29 (GMT) |
| commit | 63154cbf4501e11cae281eccbbdf9eceb453dae1 (patch) | |
| tree | be8490cf000e62f532a40fb37f652f9f4e7e477e /Source/cmCMakePresetsGraph.cxx | |
| parent | 25441f26171531ff114f3b9a6fad6ee2edc7ef29 (diff) | |
| parent | 9aa7831f05e924830848822aecdb43aa7261bc11 (diff) | |
| download | CMake-63154cbf4501e11cae281eccbbdf9eceb453dae1.zip CMake-63154cbf4501e11cae281eccbbdf9eceb453dae1.tar.gz CMake-63154cbf4501e11cae281eccbbdf9eceb453dae1.tar.bz2 | |
Merge topic 'vs-package-restore'
9aa7831f05 Presets: add resolve packages setting to build presets.
b2f8f0bb87 cmGlobalVisualStudio10Generator: Auto restore NuGet packages.
193b8fca52 cmBuildOptions: Split build arguments into separate object.
6a10103493 Help: Update preset schema description for version 3 entries.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6761
Diffstat (limited to 'Source/cmCMakePresetsGraph.cxx')
| -rw-r--r-- | Source/cmCMakePresetsGraph.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/cmCMakePresetsGraph.cxx b/Source/cmCMakePresetsGraph.cxx index 238aa68..79e8191 100644 --- a/Source/cmCMakePresetsGraph.cxx +++ b/Source/cmCMakePresetsGraph.cxx @@ -724,6 +724,9 @@ cmCMakePresetsGraph::BuildPreset::VisitPresetInherit( InheritOptionalValue(preset.CleanFirst, parent.CleanFirst); InheritOptionalValue(preset.Verbose, parent.Verbose); InheritVector(preset.NativeToolOptions, parent.NativeToolOptions); + if (!preset.ResolvePackageReferences) { + preset.ResolvePackageReferences = parent.ResolvePackageReferences; + } return ReadFileResult::READ_OK; } |