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

cmScanDepFormat: P1689R4: Factor out primary-output field

Browse Source
This commit is contained in:
Ben Boeckel
2021-06-08 11:27:39 -04:00
committed by Brad King
parent b0a8fa959c
commit aab9a5fc3e
3 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmScanDepFormat.cxx
+16 -9
View File
@@ -117,17 +117,20 @@ bool cmScanDepFormat_P1689_Parse(std::string const& arg_pp,
return false;
}
if (rule.isMember("primary-output")) {
Json::Value const& primary_output = rule["primary-output"];
PARSE_FILENAME(primary_output, info->PrimaryOutput);
}
if (rule.isMember("outputs")) {
Json::Value const& outputs = rule["outputs"];
if (outputs.isArray()) {
if (outputs.empty()) {
cmSystemTools::Error(
cmStrCat("-E cmake_ninja_dyndep failed to parse ", arg_pp,
": expected at least one 1 output"));
return false;
}
for (auto const& output : outputs) {
std::string extra_output;
PARSE_FILENAME(output, extra_output);
PARSE_FILENAME(outputs[0], info->PrimaryOutput);
info->ExtraOutputs.emplace_back(extra_output);
}
}
}
@@ -202,8 +205,12 @@ bool cmScanDepFormat_P1689_Write(std::string const& path,
Json::Value rule(Json::objectValue);
Json::Value& outputs = rule["outputs"] = Json::arrayValue;
outputs.append(info.PrimaryOutput);
rule["primary-output"] = EncodeFilename(info.PrimaryOutput);
Json::Value& rule_outputs = rule["outputs"] = Json::arrayValue;
for (auto const& output : info.ExtraOutputs) {
rule_outputs.append(EncodeFilename(output));
}
Json::Value& provides = rule["provides"] = Json::arrayValue;
for (auto const& provide : info.Provides) {