mirror of
https://github.com/Kitware/CMake.git
synced 2026-05-03 21:00:01 -05:00
cmcmd: Write progress and tar errors directly to stderr
In these code paths, `cmSystemTools::Message` never has a callback set. Inline the non-callback implementation at call sites.
This commit is contained in:
+4
-6
@@ -1112,7 +1112,7 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string> const& args,
|
|||||||
int count;
|
int count;
|
||||||
if (countFile) {
|
if (countFile) {
|
||||||
if (1 != fscanf(countFile, "%i", &count)) {
|
if (1 != fscanf(countFile, "%i", &count)) {
|
||||||
cmSystemTools::Message("Could not read from count file.");
|
std::cerr << "Could not read from count file.\n";
|
||||||
}
|
}
|
||||||
fclose(countFile);
|
fclose(countFile);
|
||||||
} else {
|
} else {
|
||||||
@@ -1426,8 +1426,7 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string> const& args,
|
|||||||
action = cmSystemTools::TarActionExtract;
|
action = cmSystemTools::TarActionExtract;
|
||||||
} break;
|
} break;
|
||||||
default: {
|
default: {
|
||||||
cmSystemTools::Message(
|
std::cerr << "tar: Unknown argument: " << flag << "\n";
|
||||||
std::string("tar: Unknown argument: ") + flag, "Warning");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1448,8 +1447,7 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string> const& args,
|
|||||||
}
|
}
|
||||||
} else if (action == cmSystemTools::TarActionCreate) {
|
} else if (action == cmSystemTools::TarActionCreate) {
|
||||||
if (files.empty()) {
|
if (files.empty()) {
|
||||||
cmSystemTools::Message("tar: No files or directories specified",
|
std::cerr << "tar: No files or directories specified\n";
|
||||||
"Warning");
|
|
||||||
}
|
}
|
||||||
if (!cmSystemTools::CreateTar(outFile, files, compress, verbose, mtime,
|
if (!cmSystemTools::CreateTar(outFile, files, compress, verbose, mtime,
|
||||||
format)) {
|
format)) {
|
||||||
@@ -1688,7 +1686,7 @@ static void cmcmdProgressReport(std::string const& dir, std::string const& num)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (1 != fscanf(progFile, "%i", &count)) {
|
if (1 != fscanf(progFile, "%i", &count)) {
|
||||||
cmSystemTools::Message("Could not read from progress file.");
|
std::cerr << "Could not read from progress file.\n";
|
||||||
}
|
}
|
||||||
fclose(progFile);
|
fclose(progFile);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user