diff options
author | Sebastian Holtermann <sebholt@xwmw.org> | 2017-09-01 14:28:26 +0200 |
---|---|---|
committer | Sebastian Holtermann <sebholt@xwmw.org> | 2017-09-07 18:03:13 +0200 |
commit | 9468e926b0fb01b2f11b9d4c9c13f7ad64b328e2 (patch) | |
tree | 0bc182683aecaea39e2d5f6afda0475d675b8a2b /Source/cmQtAutoGen.cxx | |
parent | 2ba1b2812290e962e33aa884989b7f57d43b8491 (diff) | |
download | cmake-9468e926b0fb01b2f11b9d4c9c13f7ad64b328e2.tar.gz |
Autogen: Refactor logging
Diffstat (limited to 'Source/cmQtAutoGen.cxx')
-rw-r--r-- | Source/cmQtAutoGen.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Source/cmQtAutoGen.cxx b/Source/cmQtAutoGen.cxx index cdd41cac5e..95cd122362 100644 --- a/Source/cmQtAutoGen.cxx +++ b/Source/cmQtAutoGen.cxx @@ -102,8 +102,8 @@ static bool RccListInputsQt4(const std::string& fileName, } else { if (errorMessage != nullptr) { std::ostringstream ost; - ost << "AutoRcc: Error: Rcc file not readable:\n" - << cmQtAutoGen::Quoted(fileName) << "\n"; + ost << "rcc file not readable:\n" + << " " << cmQtAutoGen::Quoted(fileName) << "\n"; *errorMessage = ost.str(); } allGood = false; @@ -145,7 +145,7 @@ static bool RccListInputsQt5(const std::string& rccCommand, std::string* errorMessage) { if (rccCommand.empty()) { - cmSystemTools::Error("AutoRcc: Error: rcc executable not available\n"); + cmSystemTools::Error("rcc executable not available"); return false; } @@ -184,7 +184,7 @@ static bool RccListInputsQt5(const std::string& rccCommand, if (!result || retVal) { if (errorMessage != nullptr) { std::ostringstream ost; - ost << "AutoRcc: Error: Rcc list process for " << fileName + ost << "rcc list process for " << cmQtAutoGen::Quoted(fileName) << " failed:\n" << rccStdOut << "\n" << rccStdErr << "\n"; @@ -217,7 +217,7 @@ static bool RccListInputsQt5(const std::string& rccCommand, if (pos == std::string::npos) { if (errorMessage != nullptr) { std::ostringstream ost; - ost << "AutoRcc: Error: Rcc lists unparsable output:\n" + ost << "rcc lists unparsable output:\n" << cmQtAutoGen::Quoted(eline) << "\n"; *errorMessage = ost.str(); } @@ -311,8 +311,8 @@ bool cmQtAutoGen::RccListInputs(const std::string& qtMajorVersion, } else { if (errorMessage != nullptr) { std::ostringstream ost; - ost << "AutoRcc: Error: Rcc file does not exist:\n" - << cmQtAutoGen::Quoted(fileName) << "\n"; + ost << "rcc file does not exist:\n" + << " " << cmQtAutoGen::Quoted(fileName) << "\n"; *errorMessage = ost.str(); } } |