diff options
| author | Brad King <brad.king@kitware.com> | 2019-12-19 14:52:01 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-12-19 14:52:34 (GMT) |
| commit | a3455779fb84a267636a1bf973940f566fd0cd99 (patch) | |
| tree | 88cadec78b867110387b907227ff26e9d934ee42 /Source | |
| parent | 50de8d744ce66f63df26e095d515c7a724941a99 (diff) | |
| parent | 7fa7f55230fda5ac0135b1f4a220c15ad5983857 (diff) | |
| download | CMake-a3455779fb84a267636a1bf973940f566fd0cd99.zip CMake-a3455779fb84a267636a1bf973940f566fd0cd99.tar.gz CMake-a3455779fb84a267636a1bf973940f566fd0cd99.tar.bz2 | |
Merge topic 'autogen-no-hh'
7fa7f55230 Autogen: Revert processing of .hh files for compatibility
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4146
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmQtAutoGenInitializer.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmQtAutoGenInitializer.cxx b/Source/cmQtAutoGenInitializer.cxx index 921e2b2..ab47f3f 100644 --- a/Source/cmQtAutoGenInitializer.cxx +++ b/Source/cmQtAutoGenInitializer.cxx @@ -763,7 +763,8 @@ bool cmQtAutoGenInitializer::InitScanFiles() // Register files that will be scanned by moc or uic if (this->MocOrUicEnabled()) { - if (cm->IsHeaderExtension(extLower)) { + // FIXME: Add a policy to include .hh files. + if (cm->IsHeaderExtension(extLower) && extLower != "hh") { addMUFile(makeMUFile(sf, fullPath, true), true); } else if (cm->IsSourceExtension(extLower)) { addMUFile(makeMUFile(sf, fullPath, true), false); @@ -875,7 +876,8 @@ bool cmQtAutoGenInitializer::InitScanFiles() std::string const& extLower = cmSystemTools::LowerCase(sf->GetExtension()); - if (cm->IsHeaderExtension(extLower)) { + // FIXME: Add a policy to include .hh files. + if (cm->IsHeaderExtension(extLower) && extLower != "hh") { if (!cmContains(this->AutogenTarget.Headers, sf)) { auto muf = makeMUFile(sf, fullPath, false); if (muf->SkipMoc || muf->SkipUic) { |