diff options
| author | Brad King <brad.king@kitware.com> | 2022-10-27 13:43:20 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-10-27 13:43:39 (GMT) |
| commit | ab8801157917c574236ee472e864408405cb83cc (patch) | |
| tree | 20ebd7ca40df3f65f53f209a2887b835a3f3f14f /Source/cmake.cxx | |
| parent | 5eab7ea84bf2549eb14877fd148f54ecfb9e1b75 (diff) | |
| parent | 7ecbe324b0ef02f63676f8431dbbbe8b4217f64f (diff) | |
| download | CMake-ab8801157917c574236ee472e864408405cb83cc.zip CMake-ab8801157917c574236ee472e864408405cb83cc.tar.gz CMake-ab8801157917c574236ee472e864408405cb83cc.tar.bz2 | |
Merge topic 'cmake-presets-workflow-arguments'
7ecbe324b0 cmake --workflow: add --fresh option
7d9aa0f00c cmake::Workflow: Refactor to use enum class argument
322193afcd cmake --workflow: print usage and exit on unrecognized argument
70aef29427 cmake --workflow: print usage message
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7825
Diffstat (limited to 'Source/cmake.cxx')
| -rw-r--r-- | Source/cmake.cxx | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 73b8e88..c068894 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -3742,7 +3742,8 @@ std::function<int()> cmake::BuildWorkflowStep( } #endif -int cmake::Workflow(const std::string& presetName, bool listPresets) +int cmake::Workflow(const std::string& presetName, + WorkflowListPresets listPresets, WorkflowFresh fresh) { #ifndef CMAKE_BOOTSTRAP this->SetHomeDirectory(cmSystemTools::GetCurrentWorkingDirectory()); @@ -3757,7 +3758,7 @@ int cmake::Workflow(const std::string& presetName, bool listPresets) return 1; } - if (listPresets) { + if (listPresets == WorkflowListPresets::Yes) { settingsFile.PrintWorkflowPresetList(); return 0; } @@ -3824,10 +3825,13 @@ int cmake::Workflow(const std::string& presetName, bool listPresets) if (!configurePreset) { return 1; } - steps.emplace_back( - stepNumber, "configure"_s, step.PresetName, - this->BuildWorkflowStep({ cmSystemTools::GetCMakeCommand(), - "--preset", step.PresetName })); + std::vector<std::string> args{ cmSystemTools::GetCMakeCommand(), + "--preset", step.PresetName }; + if (fresh == WorkflowFresh::Yes) { + args.emplace_back("--fresh"); + } + steps.emplace_back(stepNumber, "configure"_s, step.PresetName, + this->BuildWorkflowStep(args)); } break; case cmCMakePresetsGraph::WorkflowPreset::WorkflowStep::Type::Build: { auto const* buildPreset = this->FindPresetForWorkflow( |