mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-03 21:00:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

presets: Fix buildPreset "targets" not allowing a single string

Browse Source 
Fixes: #22272
This commit is contained in:
Sam Freed
2021-06-03 15:33:58 -07:00
committed by Brad King
parent 5d67632813
commit 534c40e6d8
3 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmCMakePresetsFile.cxx
+10 -7
View File
@@ -184,8 +184,8 @@ auto const PresetVectorStringHelper =
ReadFileResult::READ_OK, ReadFileResult::INVALID_PRESET, ReadFileResult::READ_OK, ReadFileResult::INVALID_PRESET,
PresetStringHelper); PresetStringHelper);
ReadFileResult PresetInheritsHelper(std::vector<std::string>& out, ReadFileResult PresetVectorOneOrMoreStringHelper(std::vector<std::string>& out,
const Json::Value* value) const Json::Value* value)
{ {
out.clear(); out.clear();
if (!value) { if (!value) {
@@ -312,8 +312,8 @@ auto const ConfigurePresetHelper =
cmJSONObjectHelper<ConfigurePreset, ReadFileResult>( cmJSONObjectHelper<ConfigurePreset, ReadFileResult>(
ReadFileResult::READ_OK, ReadFileResult::INVALID_PRESET, false) ReadFileResult::READ_OK, ReadFileResult::INVALID_PRESET, false)
.Bind("name"_s, &ConfigurePreset::Name, PresetStringHelper) .Bind("name"_s, &ConfigurePreset::Name, PresetStringHelper)
.Bind("inherits"_s, &ConfigurePreset::Inherits, PresetInheritsHelper, .Bind("inherits"_s, &ConfigurePreset::Inherits,
false) PresetVectorOneOrMoreStringHelper, false)
.Bind("hidden"_s, &ConfigurePreset::Hidden, PresetBoolHelper, false) .Bind("hidden"_s, &ConfigurePreset::Hidden, PresetBoolHelper, false)
.Bind<std::nullptr_t>("vendor"_s, nullptr, .Bind<std::nullptr_t>("vendor"_s, nullptr,
VendorHelper(ReadFileResult::INVALID_PRESET), false) VendorHelper(ReadFileResult::INVALID_PRESET), false)
@@ -340,7 +340,8 @@ auto const BuildPresetHelper =
cmJSONObjectHelper<BuildPreset, ReadFileResult>( cmJSONObjectHelper<BuildPreset, ReadFileResult>(
ReadFileResult::READ_OK, ReadFileResult::INVALID_PRESET, false) ReadFileResult::READ_OK, ReadFileResult::INVALID_PRESET, false)
.Bind("name"_s, &BuildPreset::Name, PresetStringHelper) .Bind("name"_s, &BuildPreset::Name, PresetStringHelper)
.Bind("inherits"_s, &BuildPreset::Inherits, PresetInheritsHelper, false) .Bind("inherits"_s, &BuildPreset::Inherits,
PresetVectorOneOrMoreStringHelper, false)
.Bind("hidden"_s, &BuildPreset::Hidden, PresetBoolHelper, false) .Bind("hidden"_s, &BuildPreset::Hidden, PresetBoolHelper, false)
.Bind<std::nullptr_t>("vendor"_s, nullptr, .Bind<std::nullptr_t>("vendor"_s, nullptr,
VendorHelper(ReadFileResult::INVALID_PRESET), false) VendorHelper(ReadFileResult::INVALID_PRESET), false)
@@ -356,7 +357,8 @@ auto const BuildPresetHelper =
&BuildPreset::InheritConfigureEnvironment, PresetOptionalBoolHelper, &BuildPreset::InheritConfigureEnvironment, PresetOptionalBoolHelper,
false) false)
.Bind("jobs"_s, &BuildPreset::Jobs, PresetOptionalIntHelper, false) .Bind("jobs"_s, &BuildPreset::Jobs, PresetOptionalIntHelper, false)
.Bind("targets"_s, &BuildPreset::Targets, PresetVectorStringHelper, false) .Bind("targets"_s, &BuildPreset::Targets,
PresetVectorOneOrMoreStringHelper, false)
.Bind("configuration"_s, &BuildPreset::Configuration, PresetStringHelper, .Bind("configuration"_s, &BuildPreset::Configuration, PresetStringHelper,
false) false)
.Bind("cleanFirst"_s, &BuildPreset::CleanFirst, PresetOptionalBoolHelper, .Bind("cleanFirst"_s, &BuildPreset::CleanFirst, PresetOptionalBoolHelper,
@@ -657,7 +659,8 @@ auto const TestPresetHelper =
cmJSONObjectHelper<TestPreset, ReadFileResult>( cmJSONObjectHelper<TestPreset, ReadFileResult>(
ReadFileResult::READ_OK, ReadFileResult::INVALID_PRESET, false) ReadFileResult::READ_OK, ReadFileResult::INVALID_PRESET, false)
.Bind("name"_s, &TestPreset::Name, PresetStringHelper) .Bind("name"_s, &TestPreset::Name, PresetStringHelper)
.Bind("inherits"_s, &TestPreset::Inherits, PresetInheritsHelper, false) .Bind("inherits"_s, &TestPreset::Inherits,
PresetVectorOneOrMoreStringHelper, false)
.Bind("hidden"_s, &TestPreset::Hidden, PresetBoolHelper, false) .Bind("hidden"_s, &TestPreset::Hidden, PresetBoolHelper, false)
.Bind<std::nullptr_t>("vendor"_s, nullptr, .Bind<std::nullptr_t>("vendor"_s, nullptr,
VendorHelper(ReadFileResult::INVALID_PRESET), false) VendorHelper(ReadFileResult::INVALID_PRESET), false)
Tests/RunCMake/CMakePresetsBuild/Good.json.in
+5
View File
@@ -73,6 +73,11 @@
"vendor": { "vendor": {
"example.com": "value" "example.com": "value"
} }
},
{
"name": "singleTarget",
"inherits": "build-default",
"targets": "good"
} }
] ]
} }
Tests/RunCMake/CMakePresetsBuild/RunCMakeTest.cmake
+1 -1
View File
@@ -70,7 +70,7 @@ else()
set(Good_json_jobs [["jobs": 0,]]) set(Good_json_jobs [["jobs": 0,]])
endif() endif()
run_cmake_build_presets(Good "default;other" "build-other;withEnvironment;noEnvironment;macros;vendorObject") run_cmake_build_presets(Good "default;other" "build-other;withEnvironment;noEnvironment;macros;vendorObject;singleTarget")
run_cmake_build_presets(InvalidConfigurePreset "default" "badConfigurePreset") run_cmake_build_presets(InvalidConfigurePreset "default" "badConfigurePreset")
set(CMakePresetsBuild_BUILD_ONLY 1) set(CMakePresetsBuild_BUILD_ONLY 1)