diff options
author | Sebastian Holtermann <sebholt@xwmw.org> | 2017-12-08 19:12:30 (GMT) |
---|---|---|
committer | Sebastian Holtermann <sebholt@xwmw.org> | 2017-12-13 12:50:18 (GMT) |
commit | 45b6776ab301f4b5ec51e27863ffe061b1a0d60a (patch) | |
tree | d5ab37a3cfee151068c2a540f166d0512061ea8a /Tests/QtAutogen | |
parent | d7868687c814cded6319dd0cfd9fff5c737bf0f0 (diff) | |
download | CMake-45b6776ab301f4b5ec51e27863ffe061b1a0d60a.zip CMake-45b6776ab301f4b5ec51e27863ffe061b1a0d60a.tar.gz CMake-45b6776ab301f4b5ec51e27863ffe061b1a0d60a.tar.bz2 |
Autogen: Tests: Separate SameName test
Diffstat (limited to 'Tests/QtAutogen')
-rw-r--r-- | Tests/QtAutogen/CMakeLists.txt | 4 | ||||
-rw-r--r-- | Tests/QtAutogen/CommonTests.cmake | 1 | ||||
-rw-r--r-- | Tests/QtAutogen/SameName/CMakeLists.txt (renamed from Tests/QtAutogen/sameName/CMakeLists.txt) | 7 | ||||
-rw-r--r-- | Tests/QtAutogen/SameName/aaa/bbb/data.qrc (renamed from Tests/QtAutogen/sameName/aaa/bbb/data.qrc) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/SameName/aaa/bbb/item.cpp (renamed from Tests/QtAutogen/sameName/aaa/bbb/item.cpp) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/SameName/aaa/bbb/item.hpp (renamed from Tests/QtAutogen/sameName/aaa/bbb/item.hpp) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/SameName/aaa/data.qrc (renamed from Tests/QtAutogen/sameName/aaa/data.qrc) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/SameName/aaa/item.cpp (renamed from Tests/QtAutogen/sameName/aaa/item.cpp) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/SameName/aaa/item.hpp (renamed from Tests/QtAutogen/sameName/aaa/item.hpp) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/SameName/aaa/view.ui (renamed from Tests/QtAutogen/sameName/aaa/view.ui) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/SameName/bbb/aaa/data.qrc (renamed from Tests/QtAutogen/sameName/bbb/aaa/data.qrc) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/SameName/bbb/aaa/item.cpp (renamed from Tests/QtAutogen/sameName/bbb/aaa/item.cpp) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/SameName/bbb/aaa/item.hpp (renamed from Tests/QtAutogen/sameName/bbb/aaa/item.hpp) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/SameName/bbb/data.qrc (renamed from Tests/QtAutogen/sameName/bbb/data.qrc) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/SameName/bbb/item.cpp (renamed from Tests/QtAutogen/sameName/bbb/item.cpp) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/SameName/bbb/item.hpp (renamed from Tests/QtAutogen/sameName/bbb/item.hpp) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/SameName/bbb/view.ui (renamed from Tests/QtAutogen/sameName/bbb/view.ui) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/SameName/ccc/data.qrc (renamed from Tests/QtAutogen/sameName/ccc/data.qrc) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/SameName/ccc/item.cpp (renamed from Tests/QtAutogen/sameName/ccc/item.cpp) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/SameName/ccc/item.hpp (renamed from Tests/QtAutogen/sameName/ccc/item.hpp) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/SameName/ccc/view.ui (renamed from Tests/QtAutogen/sameName/ccc/view.ui) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/SameName/data.qrc (renamed from Tests/QtAutogen/sameName/data.qrc) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/SameName/item.cpp (renamed from Tests/QtAutogen/sameName/item.cpp) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/SameName/item.hpp (renamed from Tests/QtAutogen/sameName/item.hpp) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/SameName/main.cpp (renamed from Tests/QtAutogen/sameName/main.cpp) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/SameName/view.ui (renamed from Tests/QtAutogen/sameName/view.ui) | 0 |
26 files changed, 7 insertions, 5 deletions
diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt index d13c826..47164d2 100644 --- a/Tests/QtAutogen/CMakeLists.txt +++ b/Tests/QtAutogen/CMakeLists.txt @@ -60,10 +60,6 @@ if(NON_ASCII_BDIR AND WIN32) endif() # -- Test -# Source files with the same basename in different subdirectories -add_subdirectory(sameName) - -# -- Test # Tests static library cycles add_subdirectory(staticLibraryCycle) diff --git a/Tests/QtAutogen/CommonTests.cmake b/Tests/QtAutogen/CommonTests.cmake index 1e2894e..7f72386 100644 --- a/Tests/QtAutogen/CommonTests.cmake +++ b/Tests/QtAutogen/CommonTests.cmake @@ -28,3 +28,4 @@ ADD_AUTOGEN_TEST(ObjectLibrary someProgram) if(APPLE AND (NOT QT_TEST_VERSION STREQUAL 4)) ADD_AUTOGEN_TEST(MacOsFW) endif() +ADD_AUTOGEN_TEST(SameName sameName) diff --git a/Tests/QtAutogen/sameName/CMakeLists.txt b/Tests/QtAutogen/SameName/CMakeLists.txt index f695875..c7d6e52 100644 --- a/Tests/QtAutogen/sameName/CMakeLists.txt +++ b/Tests/QtAutogen/SameName/CMakeLists.txt @@ -1,3 +1,7 @@ +cmake_minimum_required(VERSION 3.10) +project(SameName) +include("../AutogenTest.cmake") + # Test AUTOMOC and AUTORCC on source files with the same name # but in different subdirectories @@ -20,7 +24,8 @@ target_link_libraries(sameName ${QT_LIBRARIES}) set_target_properties(sameName PROPERTIES AUTOMOC TRUE AUTOUIC TRUE - AUTORCC TRUE) + AUTORCC TRUE +) # Set different compression levels if (QT_TEST_VERSION STREQUAL 4) diff --git a/Tests/QtAutogen/sameName/aaa/bbb/data.qrc b/Tests/QtAutogen/SameName/aaa/bbb/data.qrc index 0ea3537..0ea3537 100644 --- a/Tests/QtAutogen/sameName/aaa/bbb/data.qrc +++ b/Tests/QtAutogen/SameName/aaa/bbb/data.qrc diff --git a/Tests/QtAutogen/sameName/aaa/bbb/item.cpp b/Tests/QtAutogen/SameName/aaa/bbb/item.cpp index 850206f..850206f 100644 --- a/Tests/QtAutogen/sameName/aaa/bbb/item.cpp +++ b/Tests/QtAutogen/SameName/aaa/bbb/item.cpp diff --git a/Tests/QtAutogen/sameName/aaa/bbb/item.hpp b/Tests/QtAutogen/SameName/aaa/bbb/item.hpp index 0855043..0855043 100644 --- a/Tests/QtAutogen/sameName/aaa/bbb/item.hpp +++ b/Tests/QtAutogen/SameName/aaa/bbb/item.hpp diff --git a/Tests/QtAutogen/sameName/aaa/data.qrc b/Tests/QtAutogen/SameName/aaa/data.qrc index 379af60..379af60 100644 --- a/Tests/QtAutogen/sameName/aaa/data.qrc +++ b/Tests/QtAutogen/SameName/aaa/data.qrc diff --git a/Tests/QtAutogen/sameName/aaa/item.cpp b/Tests/QtAutogen/SameName/aaa/item.cpp index e35d3d1..e35d3d1 100644 --- a/Tests/QtAutogen/sameName/aaa/item.cpp +++ b/Tests/QtAutogen/SameName/aaa/item.cpp diff --git a/Tests/QtAutogen/sameName/aaa/item.hpp b/Tests/QtAutogen/SameName/aaa/item.hpp index 875f72f..875f72f 100644 --- a/Tests/QtAutogen/sameName/aaa/item.hpp +++ b/Tests/QtAutogen/SameName/aaa/item.hpp diff --git a/Tests/QtAutogen/sameName/aaa/view.ui b/Tests/QtAutogen/SameName/aaa/view.ui index 0f09980..0f09980 100644 --- a/Tests/QtAutogen/sameName/aaa/view.ui +++ b/Tests/QtAutogen/SameName/aaa/view.ui diff --git a/Tests/QtAutogen/sameName/bbb/aaa/data.qrc b/Tests/QtAutogen/SameName/bbb/aaa/data.qrc index da98009..da98009 100644 --- a/Tests/QtAutogen/sameName/bbb/aaa/data.qrc +++ b/Tests/QtAutogen/SameName/bbb/aaa/data.qrc diff --git a/Tests/QtAutogen/sameName/bbb/aaa/item.cpp b/Tests/QtAutogen/SameName/bbb/aaa/item.cpp index 7ad01c3..7ad01c3 100644 --- a/Tests/QtAutogen/sameName/bbb/aaa/item.cpp +++ b/Tests/QtAutogen/SameName/bbb/aaa/item.cpp diff --git a/Tests/QtAutogen/sameName/bbb/aaa/item.hpp b/Tests/QtAutogen/SameName/bbb/aaa/item.hpp index be07ca8..be07ca8 100644 --- a/Tests/QtAutogen/sameName/bbb/aaa/item.hpp +++ b/Tests/QtAutogen/SameName/bbb/aaa/item.hpp diff --git a/Tests/QtAutogen/sameName/bbb/data.qrc b/Tests/QtAutogen/SameName/bbb/data.qrc index 5b080f5..5b080f5 100644 --- a/Tests/QtAutogen/sameName/bbb/data.qrc +++ b/Tests/QtAutogen/SameName/bbb/data.qrc diff --git a/Tests/QtAutogen/sameName/bbb/item.cpp b/Tests/QtAutogen/SameName/bbb/item.cpp index 9ef128e..9ef128e 100644 --- a/Tests/QtAutogen/sameName/bbb/item.cpp +++ b/Tests/QtAutogen/SameName/bbb/item.cpp diff --git a/Tests/QtAutogen/sameName/bbb/item.hpp b/Tests/QtAutogen/SameName/bbb/item.hpp index d39a9d7..d39a9d7 100644 --- a/Tests/QtAutogen/sameName/bbb/item.hpp +++ b/Tests/QtAutogen/SameName/bbb/item.hpp diff --git a/Tests/QtAutogen/sameName/bbb/view.ui b/Tests/QtAutogen/SameName/bbb/view.ui index a8f506e..a8f506e 100644 --- a/Tests/QtAutogen/sameName/bbb/view.ui +++ b/Tests/QtAutogen/SameName/bbb/view.ui diff --git a/Tests/QtAutogen/sameName/ccc/data.qrc b/Tests/QtAutogen/SameName/ccc/data.qrc index f934c39..f934c39 100644 --- a/Tests/QtAutogen/sameName/ccc/data.qrc +++ b/Tests/QtAutogen/SameName/ccc/data.qrc diff --git a/Tests/QtAutogen/sameName/ccc/item.cpp b/Tests/QtAutogen/SameName/ccc/item.cpp index ab8a281..ab8a281 100644 --- a/Tests/QtAutogen/sameName/ccc/item.cpp +++ b/Tests/QtAutogen/SameName/ccc/item.cpp diff --git a/Tests/QtAutogen/sameName/ccc/item.hpp b/Tests/QtAutogen/SameName/ccc/item.hpp index 20d9dd9..20d9dd9 100644 --- a/Tests/QtAutogen/sameName/ccc/item.hpp +++ b/Tests/QtAutogen/SameName/ccc/item.hpp diff --git a/Tests/QtAutogen/sameName/ccc/view.ui b/Tests/QtAutogen/SameName/ccc/view.ui index 7989c69..7989c69 100644 --- a/Tests/QtAutogen/sameName/ccc/view.ui +++ b/Tests/QtAutogen/SameName/ccc/view.ui diff --git a/Tests/QtAutogen/sameName/data.qrc b/Tests/QtAutogen/SameName/data.qrc index 4ce0b4e..4ce0b4e 100644 --- a/Tests/QtAutogen/sameName/data.qrc +++ b/Tests/QtAutogen/SameName/data.qrc diff --git a/Tests/QtAutogen/sameName/item.cpp b/Tests/QtAutogen/SameName/item.cpp index 3d1fbe7..3d1fbe7 100644 --- a/Tests/QtAutogen/sameName/item.cpp +++ b/Tests/QtAutogen/SameName/item.cpp diff --git a/Tests/QtAutogen/sameName/item.hpp b/Tests/QtAutogen/SameName/item.hpp index 75e83f4..75e83f4 100644 --- a/Tests/QtAutogen/sameName/item.hpp +++ b/Tests/QtAutogen/SameName/item.hpp diff --git a/Tests/QtAutogen/sameName/main.cpp b/Tests/QtAutogen/SameName/main.cpp index a4ffcb3..a4ffcb3 100644 --- a/Tests/QtAutogen/sameName/main.cpp +++ b/Tests/QtAutogen/SameName/main.cpp diff --git a/Tests/QtAutogen/sameName/view.ui b/Tests/QtAutogen/SameName/view.ui index 2ffe734..2ffe734 100644 --- a/Tests/QtAutogen/sameName/view.ui +++ b/Tests/QtAutogen/SameName/view.ui |