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:33 (GMT) |
| commit | f9ee055d53b1dc49793b25f327529de53e85a52d (patch) | |
| tree | c5cb979503fd717ed9eddb496b2a75946d9291e6 /Source | |
| parent | 4126784ce4ad3e8fe2c77db4b64cfa4f89e76b51 (diff) | |
| parent | 7fa7f55230fda5ac0135b1f4a220c15ad5983857 (diff) | |
| download | CMake-f9ee055d53b1dc49793b25f327529de53e85a52d.zip CMake-f9ee055d53b1dc49793b25f327529de53e85a52d.tar.gz CMake-f9ee055d53b1dc49793b25f327529de53e85a52d.tar.bz2 | |
Merge topic 'autogen-no-hh' into release-3.16
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 a20f106..6b0fc1e 100644 --- a/Source/cmQtAutoGenInitializer.cxx +++ b/Source/cmQtAutoGenInitializer.cxx @@ -764,7 +764,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); @@ -876,7 +877,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) { |