summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Holtermann <sebholt@xwmw.org>2017-01-01 15:10:49 (GMT)
committerSebastian Holtermann <sebholt@xwmw.org>2017-01-10 11:49:16 (GMT)
commit2964b8cca4155fa318722f6ef17f0d4d56ee2f29 (patch)
treea38caf64ffbd0b460a439781af92fd73524a8c96
parentd58b6bf31c18cfedd4a2f15e009b8e5cbdc21b6e (diff)
downloadCMake-2964b8cca4155fa318722f6ef17f0d4d56ee2f29.zip
CMake-2964b8cca4155fa318722f6ef17f0d4d56ee2f29.tar.gz
CMake-2964b8cca4155fa318722f6ef17f0d4d56ee2f29.tar.bz2
AUTOGEN: Generators: Use AUTOMOC/UIC/RCC instead of AUTOGEN in messages
-rw-r--r--Source/cmQtAutoGenerators.cxx16
1 files changed, 8 insertions, 8 deletions
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 9c8594b..24d2dd7 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -705,7 +705,7 @@ bool cmQtAutoGenerators::ParseContentForMoc(
}
} else {
std::ostringstream err;
- err << "AUTOGEN: error: " << absFilename << "\n"
+ err << "AUTOMOC: error: " << absFilename << "\n"
<< "The file includes the moc file \"" << currentMoc
<< "\", but could not find header \"" << basename << '{'
<< this->JoinExts(headerExtensions) << "}\" ";
@@ -939,7 +939,7 @@ bool cmQtAutoGenerators::GenerateMocFiles(
mergedMocs.insert(notIncludedMocs.begin(), notIncludedMocs.end());
if (this->NameCollisionTest(mergedMocs, collisions)) {
std::ostringstream err;
- err << "AUTOGEN: error: "
+ err << "AUTOMOC: error: "
"The same moc file will be generated "
"from different sources."
<< std::endl
@@ -1010,7 +1010,7 @@ bool cmQtAutoGenerators::GenerateMocFiles(
// nothing changed: don't touch the moc_compilation.cpp file
if (this->Verbose) {
std::ostringstream err;
- err << "AUTOGEN: " << this->OutMocCppFilenameRel << " still up to date"
+ err << "AUTOMOC: " << this->OutMocCppFilenameRel << " still up to date"
<< std::endl;
this->LogInfo(err.str());
}
@@ -1032,7 +1032,7 @@ bool cmQtAutoGenerators::GenerateMocFiles(
if (!outfile) {
success = false;
std::ostringstream err;
- err << "AUTOGEN: error opening " << this->OutMocCppFilenameAbs << "\n";
+ err << "AUTOMOC: error opening " << this->OutMocCppFilenameAbs << "\n";
this->LogError(err.str());
} else {
outfile << automocSource;
@@ -1040,7 +1040,7 @@ bool cmQtAutoGenerators::GenerateMocFiles(
if (!outfile.good()) {
success = false;
std::ostringstream err;
- err << "AUTOGEN: error writing " << this->OutMocCppFilenameAbs << "\n";
+ err << "AUTOMOC: error writing " << this->OutMocCppFilenameAbs << "\n";
this->LogError(err.str());
}
}
@@ -1097,7 +1097,7 @@ bool cmQtAutoGenerators::GenerateMoc(const std::string& sourceFile,
if (!result || retVal) {
{
std::ostringstream err;
- err << "AUTOGEN: error: moc process for " << mocFileRel << " failed:\n"
+ err << "AUTOMOC: error: moc process for " << mocFileRel << " failed:\n"
<< output << std::endl;
this->LogError(err.str());
}
@@ -1140,7 +1140,7 @@ bool cmQtAutoGenerators::GenerateUiFiles(
std::multimap<std::string, std::string> collisions;
if (this->NameCollisionTest(testMap, collisions)) {
std::ostringstream err;
- err << "AUTOGEN: error: The same ui_NAME.h file will be generated "
+ err << "AUTOUIC: error: The same ui_NAME.h file will be generated "
"from different sources."
<< std::endl
<< "To avoid this error rename the source files." << std::endl;
@@ -1270,7 +1270,7 @@ bool cmQtAutoGenerators::GenerateQrcFiles()
std::multimap<std::string, std::string> collisions;
if (this->NameCollisionTest(qrcGenMap, collisions)) {
std::ostringstream err;
- err << "AUTOGEN: error: The same qrc_NAME.cpp file"
+ err << "AUTORCC: error: The same qrc_NAME.cpp file"
" will be generated from different sources."
<< std::endl
<< "To avoid this error rename the source .qrc files." << std::endl;