diff options
| author | Brad King <brad.king@kitware.com> | 2017-07-05 14:10:52 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-07-05 14:11:00 (GMT) |
| commit | a57b3537504c055dbd72673816a672982cc3592d (patch) | |
| tree | 0324ea4ae3bb4b26a694b29c79c892f6bdfb2c76 | |
| parent | cdb43f1c887a0695468c18968943680435c7e625 (diff) | |
| parent | 83d8aceeb35d2a378777a35fea1fb7d7c2d76362 (diff) | |
| download | CMake-a57b3537504c055dbd72673816a672982cc3592d.zip CMake-a57b3537504c055dbd72673816a672982cc3592d.tar.gz CMake-a57b3537504c055dbd72673816a672982cc3592d.tar.bz2 | |
Merge topic 'autogen-header-skip'
83d8acee Autogen: Check .moc header name against SKIP list
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1017
| -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 7f0bd86..4e71f67 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -1005,7 +1005,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)) { |