diff options
| author | Sebastian Holtermann <sebholt@xwmw.org> | 2017-12-08 16:46:58 (GMT) |
|---|---|---|
| committer | Sebastian Holtermann <sebholt@xwmw.org> | 2017-12-13 12:48:28 (GMT) |
| commit | f00e6c7c7024a784d2da310ba7b5f4a67e60fdff (patch) | |
| tree | d31c5506aa954e5a2e2f2a0282dd2842522cd4a4 /Tests | |
| parent | 6273b8354902e1af124d6f9b4a0ba23cf5e8a9b9 (diff) | |
| download | CMake-f00e6c7c7024a784d2da310ba7b5f4a67e60fdff.zip CMake-f00e6c7c7024a784d2da310ba7b5f4a67e60fdff.tar.gz CMake-f00e6c7c7024a784d2da310ba7b5f4a67e60fdff.tar.bz2 | |
Autogen: Tests: Separate RccOnly and RccEmpty tests
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/QtAutogen/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | Tests/QtAutogen/CommonTests.cmake | 2 | ||||
| -rw-r--r-- | Tests/QtAutogen/RccEmpty/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | Tests/QtAutogen/RccEmpty/rccEmpty.cpp (renamed from Tests/QtAutogen/rccEmpty.cpp) | 0 | ||||
| -rw-r--r-- | Tests/QtAutogen/RccEmpty/rccEmptyRes.qrc (renamed from Tests/QtAutogen/rccEmptyRes.qrc) | 0 | ||||
| -rw-r--r-- | Tests/QtAutogen/RccOnly/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | Tests/QtAutogen/RccOnly/rccOnly.cpp (renamed from Tests/QtAutogen/rccOnly.cpp) | 0 | ||||
| -rw-r--r-- | Tests/QtAutogen/RccOnly/rccOnlyRes.qrc (renamed from Tests/QtAutogen/rccOnlyRes.qrc) | 0 |
8 files changed, 18 insertions, 12 deletions
diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt index 85029d1..9125bd7 100644 --- a/Tests/QtAutogen/CMakeLists.txt +++ b/Tests/QtAutogen/CMakeLists.txt @@ -60,18 +60,6 @@ if(NON_ASCII_BDIR AND WIN32) endif() # -- Test -# RCC only -add_executable(rccOnly rccOnly.cpp rccOnlyRes.qrc) -set_property(TARGET rccOnly PROPERTY AUTORCC ON) -target_link_libraries(rccOnly ${QT_QTCORE_TARGET}) - -# -- Test -# RCC empty -add_executable(rccEmpty rccEmpty.cpp rccEmptyRes.qrc) -set_property(TARGET rccEmpty PROPERTY AUTORCC ON) -target_link_libraries(rccEmpty ${QT_QTCORE_TARGET}) - -# -- Test # Add not_generated_file.qrc to the source list to get the file-level # dependency, but don't generate a c++ file from it. Disable the AUTORCC # feature for this target. This tests that qrc files in the sources don't diff --git a/Tests/QtAutogen/CommonTests.cmake b/Tests/QtAutogen/CommonTests.cmake index 9121f41..0950062 100644 --- a/Tests/QtAutogen/CommonTests.cmake +++ b/Tests/QtAutogen/CommonTests.cmake @@ -4,3 +4,5 @@ ADD_AUTOGEN_TEST(MocOptions mocOptions) if(QT_TEST_ALLOW_QT_MACROS) ADD_AUTOGEN_TEST(UicOnly uicOnly) endif() +ADD_AUTOGEN_TEST(RccOnly rccOnly) +ADD_AUTOGEN_TEST(RccEmpty rccEmpty) diff --git a/Tests/QtAutogen/RccEmpty/CMakeLists.txt b/Tests/QtAutogen/RccEmpty/CMakeLists.txt new file mode 100644 index 0000000..3b16edc --- /dev/null +++ b/Tests/QtAutogen/RccEmpty/CMakeLists.txt @@ -0,0 +1,8 @@ +cmake_minimum_required(VERSION 3.10) +project(RccEmpty) +include("../AutogenTest.cmake") + +# Test AUTORCC on a .qrc file with no resource files +add_executable(rccEmpty rccEmpty.cpp rccEmptyRes.qrc) +set_property(TARGET rccEmpty PROPERTY AUTORCC ON) +target_link_libraries(rccEmpty ${QT_QTCORE_TARGET}) diff --git a/Tests/QtAutogen/rccEmpty.cpp b/Tests/QtAutogen/RccEmpty/rccEmpty.cpp index 7f2c527..7f2c527 100644 --- a/Tests/QtAutogen/rccEmpty.cpp +++ b/Tests/QtAutogen/RccEmpty/rccEmpty.cpp diff --git a/Tests/QtAutogen/rccEmptyRes.qrc b/Tests/QtAutogen/RccEmpty/rccEmptyRes.qrc index 4ca9cd5..4ca9cd5 100644 --- a/Tests/QtAutogen/rccEmptyRes.qrc +++ b/Tests/QtAutogen/RccEmpty/rccEmptyRes.qrc diff --git a/Tests/QtAutogen/RccOnly/CMakeLists.txt b/Tests/QtAutogen/RccOnly/CMakeLists.txt new file mode 100644 index 0000000..a65dee4 --- /dev/null +++ b/Tests/QtAutogen/RccOnly/CMakeLists.txt @@ -0,0 +1,8 @@ +cmake_minimum_required(VERSION 3.10) +project(RccOnly) +include("../AutogenTest.cmake") + +# Test AUTORCC being enabled only +add_executable(rccOnly rccOnly.cpp rccOnlyRes.qrc) +set_property(TARGET rccOnly PROPERTY AUTORCC ON) +target_link_libraries(rccOnly ${QT_QTCORE_TARGET}) diff --git a/Tests/QtAutogen/rccOnly.cpp b/Tests/QtAutogen/RccOnly/rccOnly.cpp index 61c7bf4..61c7bf4 100644 --- a/Tests/QtAutogen/rccOnly.cpp +++ b/Tests/QtAutogen/RccOnly/rccOnly.cpp diff --git a/Tests/QtAutogen/rccOnlyRes.qrc b/Tests/QtAutogen/RccOnly/rccOnlyRes.qrc index 5551348..5551348 100644 --- a/Tests/QtAutogen/rccOnlyRes.qrc +++ b/Tests/QtAutogen/RccOnly/rccOnlyRes.qrc |