diff options
author | Brad King <brad.king@kitware.com> | 2019-07-08 17:00:33 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2019-07-08 17:00:45 (GMT) |
commit | 80d9836a35cc72618cc79b27108d42c016b93a34 (patch) | |
tree | 00688d36c2dc0fae83e6eb42c5a3ad3f9ca10755 /Tests | |
parent | 09fe6664afd2270d1d3b851adb4125b86bd59202 (diff) | |
parent | f8a310c9d141c750fd7747f8d7eecf1142231d6e (diff) | |
download | CMake-80d9836a35cc72618cc79b27108d42c016b93a34.zip CMake-80d9836a35cc72618cc79b27108d42c016b93a34.tar.gz CMake-80d9836a35cc72618cc79b27108d42c016b93a34.tar.bz2 |
Merge topic 'autogen_header_extension'
f8a310c9d1 cmSystemTools: Remove cmSystemTools::FileFormat method
90b5289c55 cmExtraCodeLiteGenerator: Use cmake::Is*Extension for file type detection
e50fa44a35 cmake: Refactor file extension list setup
8214ad442f Tests: Autogen: Extend SameName test with additional header extensions
4a9154537c Autogen: Use cmake::IsHeader/SourceExtension for file type detection
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3511
Diffstat (limited to 'Tests')
-rw-r--r-- | Tests/QtAutogen/SameName/CMakeLists.txt | 2 | ||||
-rw-r--r-- | Tests/QtAutogen/SameName/main.cpp | 4 | ||||
-rw-r--r-- | Tests/QtAutogen/SameName/object.hh | 13 | ||||
-rw-r--r-- | Tests/QtAutogen/SameName/object_upper_ext.H | 13 |
4 files changed, 32 insertions, 0 deletions
diff --git a/Tests/QtAutogen/SameName/CMakeLists.txt b/Tests/QtAutogen/SameName/CMakeLists.txt index 0a80d5e..1919cc7 100644 --- a/Tests/QtAutogen/SameName/CMakeLists.txt +++ b/Tests/QtAutogen/SameName/CMakeLists.txt @@ -18,9 +18,11 @@ add_executable(sameName ccc/data.qrc item.cpp object.h + object.hh object.h++ object.hpp object.hxx + object_upper_ext.H data.qrc main.cpp ) diff --git a/Tests/QtAutogen/SameName/main.cpp b/Tests/QtAutogen/SameName/main.cpp index 92f15cd..725f4cd 100644 --- a/Tests/QtAutogen/SameName/main.cpp +++ b/Tests/QtAutogen/SameName/main.cpp @@ -6,8 +6,10 @@ #include "item.hpp" #include "object.h" #include "object.h++" +#include "object.hh" #include "object.hpp" #include "object.hxx" +#include "object_upper_ext.H" int main(int argv, char** args) { @@ -20,8 +22,10 @@ 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; + ::Object_Upper_Ext_H obj_upper_ext_h; return 0; } diff --git a/Tests/QtAutogen/SameName/object.hh b/Tests/QtAutogen/SameName/object.hh new file mode 100644 index 0000000..3e16f83 --- /dev/null +++ b/Tests/QtAutogen/SameName/object.hh @@ -0,0 +1,13 @@ +#ifndef OBJECT_HH +#define OBJECT_HH + +#include <QObject> + +class Object_hh : public QObject +{ + Q_OBJECT + Q_SLOT + void go(){}; +}; + +#endif diff --git a/Tests/QtAutogen/SameName/object_upper_ext.H b/Tests/QtAutogen/SameName/object_upper_ext.H new file mode 100644 index 0000000..3266087 --- /dev/null +++ b/Tests/QtAutogen/SameName/object_upper_ext.H @@ -0,0 +1,13 @@ +#ifndef OBJECT_UPPER_EXT_H +#define OBJECT_UPPER_EXT_H + +#include <QObject> + +class Object_Upper_Ext_H : public QObject +{ + Q_OBJECT + Q_SLOT + void go(){}; +}; + +#endif |