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

cmScanDepFormat: P1689R4: Diagnose invalid provides/requires json type

Browse Source
This commit is contained in:
Ben Boeckel
2021-06-08 11:27:39 -04:00
committed by Brad King
parent 82c867ad85
commit b0a8fa959c
1 changed files with 37 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Source/cmScanDepFormat.cxx
View File

@@ -133,7 +133,13 @@ bool cmScanDepFormat_P1689_Parse(std::string const& arg_pp,
if (rule.isMember("provides")) { if (rule.isMember("provides")) {
Json::Value const& provides = rule["provides"]; Json::Value const& provides = rule["provides"];
if (provides.isArray()) { if (!provides.isArray()) {
cmSystemTools::Error(
cmStrCat("-E cmake_ninja_dyndep failed to parse ", arg_pp,
": provides is not an array"));
return false;
}
for (auto const& provide : provides) { for (auto const& provide : provides) {
cmSourceReqInfo provide_info; cmSourceReqInfo provide_info;
@@ -153,11 +159,16 @@ bool cmScanDepFormat_P1689_Parse(std::string const& arg_pp,
info->Provides.push_back(provide_info); info->Provides.push_back(provide_info);
} }
} }
}
if (rule.isMember("requires")) { if (rule.isMember("requires")) {
Json::Value const& reqs = rule["requires"]; Json::Value const& reqs = rule["requires"];
if (reqs.isArray()) { if (!reqs.isArray()) {
cmSystemTools::Error(
cmStrCat("-E cmake_ninja_dyndep failed to parse ", arg_pp,
": requires is not an array"));
return false;
}
for (auto const& require : reqs) { for (auto const& require : reqs) {
cmSourceReqInfo require_info; cmSourceReqInfo require_info;
@@ -176,7 +187,6 @@ bool cmScanDepFormat_P1689_Parse(std::string const& arg_pp,
} }
} }
} }
}
return true; return true;
} }