mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-07 06:09:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'cmake-presets-list-no-generator'

Browse Source 
d9a3c9fad5 CMakePresets.json: Make --list-presets show presets with no generator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6314
This commit is contained in:
Brad King
2021-07-07 13:27:34 +00:00
committed by Kitware Robot
parent 0c972a1f58 d9a3c9fad5
commit 2cc6aa4ef4
6 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/cmake.cxx
View File

@@ -1687,6 +1687,9 @@ void cmake::PrintPresetList(const cmCMakePresetsFile& file) const
this->GetRegisteredGenerators(generators, false);
auto filter =
[&generators](const cmCMakePresetsFile::ConfigurePreset& preset) -> bool {
if (preset.Generator.empty()) {
return true;
}
auto condition = [&preset](const GeneratorInfo& info) -> bool {
return info.name == preset.Generator;
};

7
Tests/RunCMake/CMakePresets/ListPresets-stdout.txt
View File

@@ -1,6 +1,7 @@
^Not searching for unused variables given on the command line\.
Available configure presets:
"zzzzzz" - Sleepy
"aaaaaaaa" - Screaming
"mmmmmm"$
"zzzzzz" - Sleepy
"aaaaaaaa" - Screaming
"mmmmmm"
"no-generator"$

5
Tests/RunCMake/CMakePresets/ListPresets.json.in
View File

@@ -1,5 +1,5 @@
{
"version": 1,
"version": 3,
"configurePresets": [
{
"name": "zzzzzz",
@@ -18,6 +18,9 @@
"generator": "@RunCMake_GENERATOR@",
"binaryDir": "${sourceDir}/build/mmmmmm"
},
{
"name": "no-generator"
},
{
"name": "invalid-generator",
"generator": "Invalid Generator",

7
Tests/RunCMake/CMakePresets/ListPresetsHidden-stdout.txt
View File

@@ -1,6 +1,7 @@
^Not searching for unused variables given on the command line\.
Available configure presets:
"zzzzzz" - Sleepy
"aaaaaaaa" - Screaming
"mmmmmm"$
"zzzzzz" - Sleepy
"aaaaaaaa" - Screaming
"mmmmmm"
"no-generator"$

7
Tests/RunCMake/CMakePresets/ListPresetsNoSuchPreset-stdout.txt
View File

@@ -1,6 +1,7 @@
^Not searching for unused variables given on the command line\.
Available configure presets:
"zzzzzz" - Sleepy
"aaaaaaaa" - Screaming
"mmmmmm"$
"zzzzzz" - Sleepy
"aaaaaaaa" - Screaming
"mmmmmm"
"no-generator"$

7
Tests/RunCMake/CMakePresets/ListPresetsWorkingDir-stdout.txt
View File

@@ -1,6 +1,7 @@
^Not searching for unused variables given on the command line\.
Available configure presets:
"zzzzzz" - Sleepy
"aaaaaaaa" - Screaming
"mmmmmm"$
"zzzzzz" - Sleepy
"aaaaaaaa" - Screaming
"mmmmmm"
"no-generator"$