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 | |
| 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
| -rw-r--r-- | Source/cmQtAutoGenInitializer.cxx | 6 | ||||
| -rw-r--r-- | Tests/QtAutogen/SameName/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | Tests/QtAutogen/SameName/main.cpp | 2 | ||||
| -rw-r--r-- | Tests/QtAutogen/SameName/object.hh | 13 |
4 files changed, 4 insertions, 18 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) { diff --git a/Tests/QtAutogen/SameName/CMakeLists.txt b/Tests/QtAutogen/SameName/CMakeLists.txt index 1919cc7..cd29a2a 100644 --- a/Tests/QtAutogen/SameName/CMakeLists.txt +++ b/Tests/QtAutogen/SameName/CMakeLists.txt @@ -18,7 +18,6 @@ add_executable(sameName ccc/data.qrc item.cpp object.h - object.hh object.h++ object.hpp object.hxx diff --git a/Tests/QtAutogen/SameName/main.cpp b/Tests/QtAutogen/SameName/main.cpp index 725f4cd..19a6f6d 100644 --- a/Tests/QtAutogen/SameName/main.cpp +++ b/Tests/QtAutogen/SameName/main.cpp @@ -6,7 +6,6 @@ #include "item.hpp" #include "object.h" #include "object.h++" -#include "object.hh" #include "object.hpp" #include "object.hxx" #include "object_upper_ext.H" @@ -22,7 +21,6 @@ int main(int argv, char** args) ::ccc::Item ccc_item; // Object instances ::Object_h obj_h; - ::Object_hh obj_hh; ::Object_hplpl obj_hplpl; ::Object_hpp obj_hpp; ::Object_hxx obj_hxx; diff --git a/Tests/QtAutogen/SameName/object.hh b/Tests/QtAutogen/SameName/object.hh deleted file mode 100644 index 3e16f83..0000000 --- a/Tests/QtAutogen/SameName/object.hh +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef OBJECT_HH -#define OBJECT_HH - -#include <QObject> - -class Object_hh : public QObject -{ - Q_OBJECT - Q_SLOT - void go(){}; -}; - -#endif |