kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update output messages for generic use.

This commit is contained in:
Stephen Kelly 2013-10-11 13:28:48 +02:00
parent f371ab5803
commit 32771fc7ca
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Source/cmQtAutoGenerators.cxx
View File

@ -753,7 +753,7 @@ bool cmQtAutoGenerators::RunAutogen(cmMakefile* makefile)
const std::string &absFilename = *it; const std::string &absFilename = *it;
if (this->Verbose) if (this->Verbose)
{ {
std::cout << "AUTOMOC: Checking " << absFilename << std::endl; std::cout << "AUTOGEN: Checking " << absFilename << std::endl;
} }
if (this->RelaxedMode) if (this->RelaxedMode)
{ {
@ -854,7 +854,7 @@ void cmQtAutoGenerators::ParseCppFile(const std::string& absFilename,
const std::string contentsString = this->ReadAll(absFilename); const std::string contentsString = this->ReadAll(absFilename);
if (contentsString.empty()) if (contentsString.empty())
{ {
std::cerr << "AUTOMOC: warning: " << absFilename << ": file is empty\n" std::cerr << "AUTOGEN: warning: " << absFilename << ": file is empty\n"
<< std::endl; << std::endl;
return; return;
} }
@ -914,7 +914,7 @@ void cmQtAutoGenerators::ParseCppFile(const std::string& absFilename,
} }
else else
{ {
std::cerr << "AUTOMOC: error: " << absFilename << " The file " std::cerr << "AUTOGEN: error: " << absFilename << " The file "
<< "includes the moc file \"" << currentMoc << "\", " << "includes the moc file \"" << currentMoc << "\", "
<< "but could not find header \"" << basename << "but could not find header \"" << basename
<< '{' << this->Join(headerExtensions, ',') << "}\" "; << '{' << this->Join(headerExtensions, ',') << "}\" ";
@ -945,7 +945,7 @@ void cmQtAutoGenerators::ParseCppFile(const std::string& absFilename,
fileToMoc = headerToMoc; fileToMoc = headerToMoc;
if ((requiresMoc==false) &&(basename==scannedFileBasename)) if ((requiresMoc==false) &&(basename==scannedFileBasename))
{ {
std::cerr << "AUTOMOC: warning: " << absFilename << ": The file " std::cerr << "AUTOGEN: warning: " << absFilename << ": The file "
"includes the moc file \"" << currentMoc << "includes the moc file \"" << currentMoc <<
"\", but does not contain a " << macroName "\", but does not contain a " << macroName
<< " macro. Running moc on " << " macro. Running moc on "
@ -956,7 +956,7 @@ void cmQtAutoGenerators::ParseCppFile(const std::string& absFilename,
} }
else else
{ {
std::cerr << "AUTOMOC: warning: " << absFilename << ": The file " std::cerr << "AUTOGEN: warning: " << absFilename << ": The file "
"includes the moc file \"" << currentMoc << "includes the moc file \"" << currentMoc <<
"\" instead of \"moc_" << basename << ".cpp\". " "\" instead of \"moc_" << basename << ".cpp\". "
"Running moc on " "Running moc on "
@ -968,7 +968,7 @@ void cmQtAutoGenerators::ParseCppFile(const std::string& absFilename,
} }
else else
{ {
std::cerr <<"AUTOMOC: error: " << absFilename << ": The file " std::cerr <<"AUTOGEN: error: " << absFilename << ": The file "
"includes the moc file \"" << currentMoc << "includes the moc file \"" << currentMoc <<
"\", which seems to be the moc file from a different " "\", which seems to be the moc file from a different "
"source file. CMake also could not find a matching " "source file. CMake also could not find a matching "
@ -996,7 +996,7 @@ void cmQtAutoGenerators::ParseCppFile(const std::string& absFilename,
if (mocUnderscoreIncluded == true) if (mocUnderscoreIncluded == true)
{ {
// this is for KDE4 compatibility: // this is for KDE4 compatibility:
std::cerr << "AUTOMOC: warning: " << absFilename << ": The file " std::cerr << "AUTOGEN: warning: " << absFilename << ": The file "
<< "contains a " << macroName << " macro, but does not " << "contains a " << macroName << " macro, but does not "
"include " "include "
<< "\"" << scannedFileBasename << ".moc\", but instead " << "\"" << scannedFileBasename << ".moc\", but instead "
@ -1012,7 +1012,7 @@ void cmQtAutoGenerators::ParseCppFile(const std::string& absFilename,
else else
{ {
// otherwise always error out since it will not compile: // otherwise always error out since it will not compile:
std::cerr << "AUTOMOC: error: " << absFilename << ": The file " std::cerr << "AUTOGEN: error: " << absFilename << ": The file "
<< "contains a " << macroName << " macro, but does not " << "contains a " << macroName << " macro, but does not "
"include " "include "
<< "\"" << scannedFileBasename << ".moc\" !\n" << "\"" << scannedFileBasename << ".moc\" !\n"
@ -1035,7 +1035,7 @@ void cmQtAutoGenerators::StrictParseCppFile(const std::string& absFilename,
const std::string contentsString = this->ReadAll(absFilename); const std::string contentsString = this->ReadAll(absFilename);
if (contentsString.empty()) if (contentsString.empty())
{ {
std::cerr << "AUTOMOC: warning: " << absFilename << ": file is empty\n" std::cerr << "AUTOGEN: warning: " << absFilename << ": file is empty\n"
<< std::endl; << std::endl;
return; return;
} }
@ -1082,7 +1082,7 @@ void cmQtAutoGenerators::StrictParseCppFile(const std::string& absFilename,
} }
else else
{ {
std::cerr << "AUTOMOC: error: " << absFilename << " The file " std::cerr << "AUTOGEN: error: " << absFilename << " The file "
<< "includes the moc file \"" << currentMoc << "\", " << "includes the moc file \"" << currentMoc << "\", "
<< "but could not find header \"" << basename << "but could not find header \"" << basename
<< '{' << this->Join(headerExtensions, ',') << "}\" "; << '{' << this->Join(headerExtensions, ',') << "}\" ";
@ -1103,7 +1103,7 @@ void cmQtAutoGenerators::StrictParseCppFile(const std::string& absFilename,
{ {
if (basename != scannedFileBasename) if (basename != scannedFileBasename)
{ {
std::cerr <<"AUTOMOC: error: " << absFilename << ": The file " std::cerr <<"AUTOGEN: error: " << absFilename << ": The file "
"includes the moc file \"" << currentMoc << "includes the moc file \"" << currentMoc <<
"\", which seems to be the moc file from a different " "\", which seems to be the moc file from a different "
"source file. This is not supported. " "source file. This is not supported. "
@ -1127,7 +1127,7 @@ void cmQtAutoGenerators::StrictParseCppFile(const std::string& absFilename,
macroName))) macroName)))
{ {
// otherwise always error out since it will not compile: // otherwise always error out since it will not compile:
std::cerr << "AUTOMOC: error: " << absFilename << ": The file " std::cerr << "AUTOGEN: error: " << absFilename << ": The file "
<< "contains a " << macroName << " macro, but does not include " << "contains a " << macroName << " macro, but does not include "
<< "\"" << scannedFileBasename << ".moc\" !\n" << "\"" << scannedFileBasename << ".moc\" !\n"
<< std::endl; << std::endl;
@ -1188,7 +1188,7 @@ void cmQtAutoGenerators::ParseHeaders(const std::set<std::string>& absHeaders,
{ {
if (this->Verbose) if (this->Verbose)
{ {
std::cout << "AUTOMOC: Checking " << headerName << std::endl; std::cout << "AUTOGEN: Checking " << headerName << std::endl;
} }
const std::string basename = cmsys::SystemTools:: const std::string basename = cmsys::SystemTools::
@ -1274,7 +1274,7 @@ bool cmQtAutoGenerators::GenerateMoc(const std::string& sourceFile,
bool result = cmSystemTools::RunSingleCommand(command, &output, &retVal); bool result = cmSystemTools::RunSingleCommand(command, &output, &retVal);
if (!result || retVal) if (!result || retVal)
{ {
std::cerr << "AUTOMOC: error: process for " << mocFilePath <<" failed:\n" std::cerr << "AUTOGEN: error: process for " << mocFilePath <<" failed:\n"
<< output << std::endl; << output << std::endl;
this->RunMocFailed = true; this->RunMocFailed = true;
cmSystemTools::RemoveFile(mocFilePath.c_str()); cmSystemTools::RemoveFile(mocFilePath.c_str());