mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-07 14:20:06 -06:00
Code Issues Packages Projects Releases Wiki Activity

Autogen: Check .moc header name against SKIP list

Browse Source 
When encountering an #include "FOO.moc" statement where
FOO.hpp was chosen over FOO.cpp as the moc source, the
FOO.hpp name was not checked against the moc SKIP list.
This commit is contained in:
Sebastian Holtermann
2017-06-30 13:26:18 +02:00
committed by Brad King
parent 372de3f803
commit 83d8aceeb3
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmQtAutoGenerators.cxx
View File

@@ -1003,7 +1003,7 @@ bool cmQtAutoGenerators::MocParseSourceContent(
// In relaxed mode try to find a header instead but issue a warning // In relaxed mode try to find a header instead but issue a warning
const std::string headerToMoc = const std::string headerToMoc =
this->MocFindHeader(scannedFileAbsPath, incSubDir + incBasename); this->MocFindHeader(scannedFileAbsPath, incSubDir + incBasename);
if (!headerToMoc.empty()) { if (!headerToMoc.empty() && !this->MocSkip(headerToMoc)) {
// This is for KDE4 compatibility: // This is for KDE4 compatibility:
fileToMoc = headerToMoc; fileToMoc = headerToMoc;
if (!requiresMoc && (incBasename == scannedFileBasename)) { if (!requiresMoc && (incBasename == scannedFileBasename)) {