diff options
| author | Sebastian Holtermann <sebholt@xwmw.org> | 2017-06-30 11:26:18 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-06-30 16:53:24 (GMT) |
| commit | 83d8aceeb35d2a378777a35fea1fb7d7c2d76362 (patch) | |
| tree | 58a9d5fbd328ffd0d1e1134d93fb679b37c86f8e /Source | |
| parent | 372de3f8039f69b3a2edcf7120083ec4097f8bd3 (diff) | |
| download | CMake-83d8aceeb35d2a378777a35fea1fb7d7c2d76362.zip CMake-83d8aceeb35d2a378777a35fea1fb7d7c2d76362.tar.gz CMake-83d8aceeb35d2a378777a35fea1fb7d7c2d76362.tar.bz2 | |
Autogen: Check .moc header name against SKIP list
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.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmQtAutoGenerators.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index 27e4928..6d3305b 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -1003,7 +1003,7 @@ bool cmQtAutoGenerators::MocParseSourceContent( // In relaxed mode try to find a header instead but issue a warning const std::string headerToMoc = this->MocFindHeader(scannedFileAbsPath, incSubDir + incBasename); - if (!headerToMoc.empty()) { + if (!headerToMoc.empty() && !this->MocSkip(headerToMoc)) { // This is for KDE4 compatibility: fileToMoc = headerToMoc; if (!requiresMoc && (incBasename == scannedFileBasename)) { |