Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-15 20:46:37 +08:00
Code Issues Projects Releases Wiki Activity

cmScanDepFormat: Fix name of our internal tool in parse errors

Browse Source 
We parse the scan result `.ddi` files in `-E cmake_ninja_dyndep`,
not `-E cmake_ninja_depends`.
This commit is contained in:
Brad King
2020-12-01 16:47:44 -05:00
parent dacd93a2db
commit 988f997100
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Source/cmScanDepFormat.cxx
View File

@@ -55,9 +55,8 @@ static Json::Value EncodeFilename(std::string const& path)
#define PARSE_BLOB(val, res) \
do { \
if (!ParseFilename(val, res)) { \
cmSystemTools::Error( \
cmStrCat("-E cmake_ninja_depends failed to parse ", arg_pp, \
": invalid blob")); \
cmSystemTools::Error(cmStrCat("-E cmake_ninja_dyndep failed to parse ", \
arg_pp, ": invalid blob")); \
return false; \
} \
} while (0)
@@ -65,9 +64,8 @@ static Json::Value EncodeFilename(std::string const& path)
#define PARSE_FILENAME(val, res) \
do { \
if (!ParseFilename(val, res)) { \
cmSystemTools::Error( \
cmStrCat("-E cmake_ninja_depends failed to parse ", arg_pp, \
": invalid filename")); \
cmSystemTools::Error(cmStrCat("-E cmake_ninja_dyndep failed to parse ", \
arg_pp, ": invalid filename")); \
return false; \
} \
\
@@ -84,7 +82,7 @@ bool cmScanDepFormat_P1689_Parse(std::string const& arg_pp, cmSourceInfo* info)
{
Json::Reader reader;
if (!reader.parse(ppf, ppio, false)) {
cmSystemTools::Error(cmStrCat("-E cmake_ninja_depends failed to parse ",
cmSystemTools::Error(cmStrCat("-E cmake_ninja_dyndep failed to parse ",
arg_pp,
reader.getFormattedErrorMessages()));
return false;
@@ -93,7 +91,7 @@ bool cmScanDepFormat_P1689_Parse(std::string const& arg_pp, cmSourceInfo* info)
Json::Value const& version = ppi["version"];
if (version.asUInt() != 0) {
cmSystemTools::Error(cmStrCat("-E cmake_ninja_depends failed to parse ",
cmSystemTools::Error(cmStrCat("-E cmake_ninja_dyndep failed to parse ",
arg_pp, ": version ", version.asString()));
return false;
}
@@ -101,7 +99,7 @@ bool cmScanDepFormat_P1689_Parse(std::string const& arg_pp, cmSourceInfo* info)
Json::Value const& rules = ppi["rules"];
if (rules.isArray()) {
if (rules.size() != 1) {
cmSystemTools::Error(cmStrCat("-E cmake_ninja_depends failed to parse ",
cmSystemTools::Error(cmStrCat("-E cmake_ninja_dyndep failed to parse ",
arg_pp, ": expected 1 source entry"));
return false;
}
@@ -109,9 +107,9 @@ bool cmScanDepFormat_P1689_Parse(std::string const& arg_pp, cmSourceInfo* info)
for (auto const& rule : rules) {
Json::Value const& workdir = rule["work-directory"];
if (!workdir.isString()) {
cmSystemTools::Error(
cmStrCat("-E cmake_ninja_depends failed to parse ", arg_pp,
": work-directory is not a string"));
cmSystemTools::Error(cmStrCat("-E cmake_ninja_dyndep failed to parse ",
arg_pp,
": work-directory is not a string"));
return false;
}
std::string work_directory;
@@ -134,7 +132,7 @@ bool cmScanDepFormat_P1689_Parse(std::string const& arg_pp, cmSourceInfo* info)
if (outputs.isArray()) {
if (outputs.empty()) {
cmSystemTools::Error(
cmStrCat("-E cmake_ninja_depends failed to parse ", arg_pp,
cmStrCat("-E cmake_ninja_dyndep failed to parse ", arg_pp,
": expected at least one 1 output"));
return false;
}