diff options
| author | Brad King <brad.king@kitware.com> | 2017-06-30 17:07:22 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-07-05 13:42:15 (GMT) |
| commit | ef31812ede6ca1eafd8723e8478e533deadfc4f0 (patch) | |
| tree | d450df1960cbe36a0c986bd6fcc07c3129f69548 /Source | |
| parent | 2086003145b92b2f7b7d364aa0bba69c55997b73 (diff) | |
| parent | 83d8aceeb35d2a378777a35fea1fb7d7c2d76362 (diff) | |
| download | CMake-ef31812ede6ca1eafd8723e8478e533deadfc4f0.zip CMake-ef31812ede6ca1eafd8723e8478e533deadfc4f0.tar.gz CMake-ef31812ede6ca1eafd8723e8478e533deadfc4f0.tar.bz2 | |
Merge branch 'autogen-header-skip' into release-3.9
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)) { |