summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorAlex Neundorf <neundorf@kde.org>2011-12-14 18:12:15 (GMT)
committerAlex Neundorf <neundorf@kde.org>2011-12-14 18:12:15 (GMT)
commite474dcb23197489640456b46862a5aa7019834a5 (patch)
tree739af009c616f33a3334660fc1cc8650dab0b548 /Source
parent96fc5d5d0701c98a5029469c8a9dcc6aa6576278 (diff)
downloadCMake-e474dcb23197489640456b46862a5aa7019834a5.zip
CMake-e474dcb23197489640456b46862a5aa7019834a5.tar.gz
CMake-e474dcb23197489640456b46862a5aa7019834a5.tar.bz2
automoc: improved warning message in relaxed mode
Alex
Diffstat (limited to 'Source')
-rw-r--r--Source/cmQtAutomoc.cxx13
1 files changed, 8 insertions, 5 deletions
diff --git a/Source/cmQtAutomoc.cxx b/Source/cmQtAutomoc.cxx
index 0b97436..0d0d80c 100644
--- a/Source/cmQtAutomoc.cxx
+++ b/Source/cmQtAutomoc.cxx
@@ -698,8 +698,9 @@ void cmQtAutomoc::ParseCppFile(const std::string& absFilename,
"includes the moc file \"" << currentMoc <<
"\", but does not contain a Q_OBJECT macro. "
"Running moc on "
- << "\"" << headerToMoc << "\" ! Better include \"moc_"
- << basename << ".cpp\" for a robust build.\n"
+ << "\"" << headerToMoc << "\" ! Include \"moc_"
+ << basename << ".cpp\" for a compatiblity with "
+ "strict mode (see CMAKE_AUTOMOC_RELAXED_MODE).\n"
<< std::endl;
}
else
@@ -708,8 +709,9 @@ void cmQtAutomoc::ParseCppFile(const std::string& absFilename,
"includes the moc file \"" << currentMoc <<
"\" instead of \"moc_" << basename << ".cpp\". "
"Running moc on "
- << "\"" << headerToMoc << "\" ! Better include \"moc_"
- << basename << ".cpp\" for a robust build.\n"
+ << "\"" << headerToMoc << "\" ! Include \"moc_"
+ << basename << ".cpp\" for compatiblity with "
+ "strict mode (see CMAKE_AUTOMOC_RELAXED_MODE).\n"
<< std::endl;
}
}
@@ -749,7 +751,8 @@ void cmQtAutomoc::ParseCppFile(const std::string& absFilename,
"includes "
<< "\"" << ownMocUnderscoreFile << "\". Running moc on "
<< "\"" << 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;
includedMocs[absFilename] = ownMocUnderscoreFile;
includedMocs.erase(ownMocHeaderFile);