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

automoc: stricter checking for what file is included 

foo.cpp must include foo.moc to have itself processed by moc

Alex
This commit is contained in:
Alex Neundorf 2011-11-10 20:25:28 +01:00
parent fce8e81895
commit d08bc32bc2
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/cmQtAutomoc.cxx
View File

@ -517,6 +517,8 @@ void cmQtAutomoc::ParseCppFile(const std::string& absFilename,
} }
const std::string absPath = cmsys::SystemTools::GetFilenamePath( const std::string absPath = cmsys::SystemTools::GetFilenamePath(
cmsys::SystemTools::GetRealPath(absFilename.c_str())) + '/'; cmsys::SystemTools::GetRealPath(absFilename.c_str())) + '/';
const std::string scannedFileBasename = cmsys::SystemTools::
GetFilenameWithoutLastExtension(absFilename);
std::string::size_type matchOffset = 0; std::string::size_type matchOffset = 0;
if (mocIncludeRegExp.find(contentsString.c_str())) if (mocIncludeRegExp.find(contentsString.c_str()))
@ -605,6 +607,16 @@ void cmQtAutomoc::ParseCppFile(const std::string& absFilename,
} }
else else
{ {
if (basename != scannedFileBasename)
{
std::cerr << "AUTOMOC: The file \"" << absFilename
<< "\" includes the moc file \"" << currentMoc
<< "\", which seems to be the moc file from a different "
<< "source file. This is not supported. "
<< "Include \"" << scannedFileBasename << ".moc\" to run "
<< "moc on this source file." << std::endl;
::exit(EXIT_FAILURE);
}
includedMocs[absFilename] = currentMoc; includedMocs[absFilename] = currentMoc;
} }
matchOffset += mocIncludeRegExp.end(); matchOffset += mocIncludeRegExp.end();