Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-21 06:10:16 +08:00
Code Issues Projects Releases Wiki Activity

Fail at read-time if configurePreset field invalid

Browse Source
This commit is contained in:
Sam Freed
2021-03-15 14:44:43 -07:00
parent dfdea7d9e3
commit 83eeeff7dc
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Source/cmCMakePresetsFile.cxx
View File

@@ -1431,8 +1431,11 @@ cmCMakePresetsFile::ReadProjectPresetsInternal(bool allowNoFiles)
if (!it.second.Unexpanded.Hidden) { if (!it.second.Unexpanded.Hidden) {
const auto configurePreset = const auto configurePreset =
this->ConfigurePresets.find(it.second.Unexpanded.ConfigurePreset); this->ConfigurePresets.find(it.second.Unexpanded.ConfigurePreset);
if (it.second.Unexpanded.InheritConfigureEnvironment.value_or(true) && if (configurePreset == this->ConfigurePresets.end()) {
configurePreset != this->ConfigurePresets.end()) { return ReadFileResult::INVALID_CONFIGURE_PRESET;
}
if (it.second.Unexpanded.InheritConfigureEnvironment.value_or(true)) {
it.second.Unexpanded.Environment.insert( it.second.Unexpanded.Environment.insert(
configurePreset->second.Unexpanded.Environment.begin(), configurePreset->second.Unexpanded.Environment.begin(),
configurePreset->second.Unexpanded.Environment.end()); configurePreset->second.Unexpanded.Environment.end());
@@ -1448,8 +1451,11 @@ cmCMakePresetsFile::ReadProjectPresetsInternal(bool allowNoFiles)
if (!it.second.Unexpanded.Hidden) { if (!it.second.Unexpanded.Hidden) {
const auto configurePreset = const auto configurePreset =
this->ConfigurePresets.find(it.second.Unexpanded.ConfigurePreset); this->ConfigurePresets.find(it.second.Unexpanded.ConfigurePreset);
if (it.second.Unexpanded.InheritConfigureEnvironment.value_or(true) && if (configurePreset == this->ConfigurePresets.end()) {
configurePreset != this->ConfigurePresets.end()) { return ReadFileResult::INVALID_CONFIGURE_PRESET;
}
if (it.second.Unexpanded.InheritConfigureEnvironment.value_or(true)) {
it.second.Unexpanded.Environment.insert( it.second.Unexpanded.Environment.insert(
configurePreset->second.Unexpanded.Environment.begin(), configurePreset->second.Unexpanded.Environment.begin(),
configurePreset->second.Unexpanded.Environment.end()); configurePreset->second.Unexpanded.Environment.end());
@@ -1502,6 +1508,8 @@ const char* cmCMakePresetsFile::ResultToString(ReadFileResult result)
case ReadFileResult::BUILD_TEST_PRESETS_UNSUPPORTED: case ReadFileResult::BUILD_TEST_PRESETS_UNSUPPORTED:
return "File version must be 2 or higher for build and test preset " return "File version must be 2 or higher for build and test preset "
"support."; "support.";
case ReadFileResult::INVALID_CONFIGURE_PRESET:
return "Invalid \"configurePreset\" field";
} }
return "Unknown error"; return "Unknown error";

1
Source/cmCMakePresetsFile.h
View File

@@ -32,6 +32,7 @@ public:
USER_PRESET_INHERITANCE, USER_PRESET_INHERITANCE,
INVALID_MACRO_EXPANSION, INVALID_MACRO_EXPANSION,
BUILD_TEST_PRESETS_UNSUPPORTED, BUILD_TEST_PRESETS_UNSUPPORTED,
INVALID_CONFIGURE_PRESET,
}; };
enum class ArchToolsetStrategy enum class ArchToolsetStrategy