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

automoc: improved warning message in relaxed mode 

Alex
This commit is contained in:
Alex Neundorf 2011-12-14 19:12:15 +01:00
parent 96fc5d5d07
commit e474dcb231
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/cmQtAutomoc.cxx
View File

@ -698,8 +698,9 @@ void cmQtAutomoc::ParseCppFile(const std::string& absFilename,
"includes the moc file \"" << currentMoc << "includes the moc file \"" << currentMoc <<
"\", but does not contain a Q_OBJECT macro. " "\", but does not contain a Q_OBJECT macro. "
"Running moc on " "Running moc on "
<< "\"" << headerToMoc << "\" ! Better include \"moc_" << "\"" << headerToMoc << "\" ! Include \"moc_"
<< basename << ".cpp\" for a robust build.\n" << basename << ".cpp\" for a compatiblity with "
"strict mode (see CMAKE_AUTOMOC_RELAXED_MODE).\n"
<< std::endl; << std::endl;
} }
else else
@ -708,8 +709,9 @@ void cmQtAutomoc::ParseCppFile(const std::string& absFilename,
"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 "
<< "\"" << headerToMoc << "\" ! Better include \"moc_" << "\"" << headerToMoc << "\" ! Include \"moc_"
<< basename << ".cpp\" for a robust build.\n" << basename << ".cpp\" for compatiblity with "
"strict mode (see CMAKE_AUTOMOC_RELAXED_MODE).\n"
<< std::endl; << std::endl;
} }
} }
@ -749,7 +751,8 @@ void cmQtAutomoc::ParseCppFile(const std::string& absFilename,
"includes " "includes "
<< "\"" << ownMocUnderscoreFile << "\". Running moc on " << "\"" << ownMocUnderscoreFile << "\". Running moc on "
<< "\"" << absFilename << "\" ! Better include \"" << "\"" << absFilename << "\" ! Better include \""
<< scannedFileBasename << ".moc\" for a robust build.\n" << scannedFileBasename << ".moc\" for compatiblity with "
"strict mode (see CMAKE_AUTOMOC_RELAXED_MODE).\n"
<< std::endl; << std::endl;
includedMocs[absFilename] = ownMocUnderscoreFile; includedMocs[absFilename] = ownMocUnderscoreFile;
includedMocs.erase(ownMocHeaderFile); includedMocs.erase(ownMocHeaderFile);