diff options
| author | Brad King <brad.king@kitware.com> | 2022-04-12 12:15:54 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-04-12 08:16:00 -0400 |
| commit | 4135d726d4f5f846a4551738c9b289eb3cb45ce6 (patch) | |
| tree | 559b3f5da157aa8630cfbd0ba7487b1e8b0ebe0e | |
| parent | 569e8a136188f186a53d0728671c07b6ad8976cb (diff) | |
| parent | 45299a8f9bd366e7f41b938dfed6df9c3d4eac0d (diff) | |
| download | cmake-4135d726d4f5f846a4551738c9b289eb3cb45ce6.tar.gz | |
Merge topic 'correct_list-presets_parsing' into release-3.23
45299a8f9b cmake: --list=presets=[type] doesn't generate incorrect warnings
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7164
| -rw-r--r-- | Source/cmakemain.cxx | 5 | ||||
| -rw-r--r-- | Tests/RunCMake/CMakePresets/ListConfigurePresetsWorkingDir-stdout.txt | 7 | ||||
| -rw-r--r-- | Tests/RunCMake/CMakePresets/RunCMakeTest.cmake | 10 |
3 files changed, 19 insertions, 3 deletions
diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx index 0554c3e3e0..76055b4ad7 100644 --- a/Source/cmakemain.cxx +++ b/Source/cmakemain.cxx @@ -306,10 +306,11 @@ int do_cmake(int ac, char const* const* av) parsedArgs.emplace_back("--find-package"); return true; } }, - CommandArgument{ "--list-presets", CommandArgument::Values::Zero, - [&](std::string const&) -> bool { + CommandArgument{ "--list-presets", CommandArgument::Values::ZeroOrOne, + [&](std::string const& value) -> bool { workingMode = cmake::HELP_MODE; parsedArgs.emplace_back("--list-presets"); + parsedArgs.emplace_back(value); return true; } }, }; diff --git a/Tests/RunCMake/CMakePresets/ListConfigurePresetsWorkingDir-stdout.txt b/Tests/RunCMake/CMakePresets/ListConfigurePresetsWorkingDir-stdout.txt new file mode 100644 index 0000000000..97eedae7c6 --- /dev/null +++ b/Tests/RunCMake/CMakePresets/ListConfigurePresetsWorkingDir-stdout.txt @@ -0,0 +1,7 @@ +^Not searching for unused variables given on the command line\. +Available configure presets: + + "zzzzzz" - Sleepy + "aaaaaaaa" - Screaming + "mmmmmm" + "no-generator"$ diff --git a/Tests/RunCMake/CMakePresets/RunCMakeTest.cmake b/Tests/RunCMake/CMakePresets/RunCMakeTest.cmake index 449132ab4f..5867efd25c 100644 --- a/Tests/RunCMake/CMakePresets/RunCMakeTest.cmake +++ b/Tests/RunCMake/CMakePresets/RunCMakeTest.cmake @@ -71,13 +71,18 @@ function(run_cmake_presets name) set(_unused_cli) endif() + set(_preset "--preset=${name}") + if(CMakePresets_NO_PRESET) + set(_preset) + endif() + set(RunCMake_TEST_COMMAND ${CMAKE_COMMAND} ${_source_args} -DRunCMake_TEST=${name} -DRunCMake_GENERATOR=${RunCMake_GENERATOR} -DCMAKE_MAKE_PROGRAM=${RunCMake_MAKE_PROGRAM} ${_unused_cli} - --preset=${name} + ${_preset} ${ARGN} ) run_cmake(${name}) @@ -288,7 +293,10 @@ run_cmake_presets(ListPresets --list-presets) set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/ListPresetsWorkingDir") set(RunCMake_TEST_NO_CLEAN 1) set(CMakePresets_NO_SOURCE_ARGS 1) +set(CMakePresets_NO_PRESET 1) run_cmake_presets(ListPresetsWorkingDir --list-presets) +run_cmake_presets(ListConfigurePresetsWorkingDir --list-presets=configure) +unset(CMakePresets_NO_PRESET) unset(CMakePresets_NO_SOURCE_ARGS) unset(RunCMake_TEST_NO_CLEAN) unset(RunCMake_TEST_BINARY_DIR) |