dilim/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-08-10 17:14:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'forward-preset-file' into release-4.4

Browse Source 
6e89bd5d55 Presets: Forward presets-file to workflow steps

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !12267
This commit is contained in:
Brad King
2026-07-14 12:53:36 +00:00
committed by Kitware Robot
parent 44125a9e97 6e89bd5d55
commit 4a43b399c5
3 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Source/cmake.cxx
View File

@@ -4386,6 +4386,15 @@ int cmake::Workflow(cmCMakePresetsWorkflowArgs const& args)
}
};
auto buildPresetCommand = [&args](std::vector<std::string> cmd,
std::string const& presetName) {
cmd.insert(cmd.end(), { "--preset", presetName });
if (!args.PresetsFile.empty()) {
cmd.insert(cmd.end(), { "--presets-file", args.PresetsFile });
}
return cmd;
};
std::vector<CalculatedStep> steps;
steps.reserve(expandedPreset->Steps.size());
int stepNumber = 1;
@@ -4399,9 +4408,8 @@ int cmake::Workflow(cmCMakePresetsWorkflowArgs const& args)
if (!configurePreset) {
return 1;
}
std::vector<std::string> configureCmdArgs{
cmSystemTools::GetCMakeCommand(), "--preset", step.PresetName
};
std::vector<std::string> configureCmdArgs = buildPresetCommand(
{ cmSystemTools::GetCMakeCommand() }, step.PresetName);
if (args.Fresh) {
configureCmdArgs.emplace_back("--fresh");
}
@@ -4414,10 +4422,10 @@ int cmake::Workflow(cmCMakePresetsWorkflowArgs const& args)
if (!buildPreset) {
return 1;
}
steps.emplace_back(
stepNumber, "build"_s, step.PresetName,
buildWorkflowStep({ cmSystemTools::GetCMakeCommand(), "--build",
"--preset", step.PresetName }));
std::vector<std::string> buildCmdArgs = buildPresetCommand(
{ cmSystemTools::GetCMakeCommand(), "--build" }, step.PresetName);
steps.emplace_back(stepNumber, "build"_s, step.PresetName,
buildWorkflowStep(buildCmdArgs));
} break;
case cmCMakePresetsGraph::WorkflowPreset::WorkflowStep::Type::Test: {
auto const* testPreset = this->FindPresetForWorkflow(
@@ -4425,10 +4433,10 @@ int cmake::Workflow(cmCMakePresetsWorkflowArgs const& args)
if (!testPreset) {
return 1;
}
steps.emplace_back(
stepNumber, "test"_s, step.PresetName,
buildWorkflowStep({ cmSystemTools::GetCTestCommand(), "--preset",
step.PresetName }));
std::vector<std::string> testCmdArgs = buildPresetCommand(
{ cmSystemTools::GetCTestCommand() }, step.PresetName);
steps.emplace_back(stepNumber, "test"_s, step.PresetName,
buildWorkflowStep(testCmdArgs));
} break;
case cmCMakePresetsGraph::WorkflowPreset::WorkflowStep::Type::Package: {
auto const* packagePreset = this->FindPresetForWorkflow(
@@ -4436,10 +4444,10 @@ int cmake::Workflow(cmCMakePresetsWorkflowArgs const& args)
if (!packagePreset) {
return 1;
}
steps.emplace_back(
stepNumber, "package"_s, step.PresetName,
buildWorkflowStep({ cmSystemTools::GetCPackCommand(), "--preset",
step.PresetName }));
std::vector<std::string> packageCmdArgs = buildPresetCommand(
{ cmSystemTools::GetCPackCommand() }, step.PresetName);
steps.emplace_back(stepNumber, "package"_s, step.PresetName,
buildWorkflowStep(packageCmdArgs));
} break;
}
stepNumber++;

0
Tests/RunCMake/CMakePresetsTest/OtherCMakePresetsFileListPresets-text-x-stdout.txt → Tests/RunCMake/CMakePresetsTest/OtherCMakePresetsFileListPresets-test-x-stdout.txt
View File

4
Tests/RunCMake/CMakePresetsWorkflow/RunCMakeTest.cmake
View File

@@ -86,9 +86,11 @@ unset(CMakePresets_FILE)
unset(CMakeUserPresets_FILE)
unset(CMakePresets_ASSETS)
set(CMakePresets_FILE "${RunCMake_SOURCE_DIR}/DoesNotExist.json.in")
set(CMakePresets_FILE_ARG "OtherCMakePresetsFile.json")
run_cmake_workflow_presets(OtherCMakePresetsFile)
run_cmake_workflow_presets(OtherCMakePresetsFileListPreset --list-presets)
run_cmake_workflow_presets(OtherCMakePresetsFileListPresets --list-presets)
unset(CMakePresets_FILE)
unset(CMakePresets_FILE_ARG)
run_cmake_workflow_presets(ListPresets --list-presets)