diff options
| author | Brad King <brad.king@kitware.com> | 2021-03-30 13:54:02 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-03-30 13:54:09 (GMT) |
| commit | f14e19c053852615d936d63352f788e2e558737e (patch) | |
| tree | 1a33c5d91498bc7fd10281ff390591e065b1e6b8 /Source/cmQtAutoGenInitializer.cxx | |
| parent | 6081fdf41534e8da6acd403eb7b3707dcc9d47b8 (diff) | |
| parent | ca7c76269b0dbf899f206c6d0c6d7b26fd0af223 (diff) | |
| download | CMake-f14e19c053852615d936d63352f788e2e558737e.zip CMake-f14e19c053852615d936d63352f788e2e558737e.tar.gz CMake-f14e19c053852615d936d63352f788e2e558737e.tar.bz2 | |
Merge topic 'ninja-automoc-cycle'
ca7c76269b Tests: Add test for Ninja automoc dependency cyle
54ad3e4958 autogen: Don't include SKIP_AUTOMOC files in depfile
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Jörg Bornemann <joerg.bornemann@qt.io>
Acked-by: Craig Scott <craig.scott@crascit.com>
Merge-request: !5956
Diffstat (limited to 'Source/cmQtAutoGenInitializer.cxx')
| -rw-r--r-- | Source/cmQtAutoGenInitializer.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmQtAutoGenInitializer.cxx b/Source/cmQtAutoGenInitializer.cxx index 450a0cd..6528687 100644 --- a/Source/cmQtAutoGenInitializer.cxx +++ b/Source/cmQtAutoGenInitializer.cxx @@ -1494,15 +1494,15 @@ bool cmQtAutoGenInitializer::SetupWriteAutogenInfo() headers.reserve(this->AutogenTarget.Headers.size()); for (auto const& pair : this->AutogenTarget.Headers) { MUFile const* const muf = pair.second.get(); - if (muf->Generated && !this->CMP0071Accept) { - continue; - } if (muf->SkipMoc) { moc_skip.insert(muf->FullPath); } if (muf->SkipUic) { uic_skip.insert(muf->FullPath); } + if (muf->Generated && !this->CMP0071Accept) { + continue; + } if (muf->MocIt || muf->UicIt) { headers.emplace_back(muf); } |