From f658bdaa7c7899a46caf402d4114999019897d46 Mon Sep 17 00:00:00 2001 From: Sebastian Holtermann Date: Fri, 8 Dec 2017 18:03:20 +0100 Subject: Autogen: Tests: Separate RccOffMocLibrary test --- Tests/QtAutogen/CMakeLists.txt | 16 ---------------- Tests/QtAutogen/CommonTests.cmake | 1 + Tests/QtAutogen/RccOffMocLibrary/CMakeLists.txt | 17 +++++++++++++++++ Tests/QtAutogen/RccOffMocLibrary/empty.cpp | 1 + Tests/QtAutogen/RccOffMocLibrary/empty.h | 9 +++++++++ Tests/QtAutogen/RccOffMocLibrary/not_generated_file.qrc | 5 +++++ Tests/QtAutogen/empty.cpp | 1 - Tests/QtAutogen/empty.h | 9 --------- Tests/QtAutogen/not_generated_file.qrc | 5 ----- 9 files changed, 33 insertions(+), 31 deletions(-) create mode 100644 Tests/QtAutogen/RccOffMocLibrary/CMakeLists.txt create mode 100644 Tests/QtAutogen/RccOffMocLibrary/empty.cpp create mode 100644 Tests/QtAutogen/RccOffMocLibrary/empty.h create mode 100644 Tests/QtAutogen/RccOffMocLibrary/not_generated_file.qrc delete mode 100644 Tests/QtAutogen/empty.cpp delete mode 100644 Tests/QtAutogen/empty.h delete mode 100644 Tests/QtAutogen/not_generated_file.qrc diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt index 9125bd7..723747a 100644 --- a/Tests/QtAutogen/CMakeLists.txt +++ b/Tests/QtAutogen/CMakeLists.txt @@ -60,22 +60,6 @@ if(NON_ASCII_BDIR AND WIN32) endif() # -- 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 -# have an effect on generation if AUTORCC is off. -add_library(empty STATIC empty.cpp not_generated_file.qrc) -set_target_properties(empty PROPERTIES AUTORCC OFF) -set_target_properties(empty PROPERTIES AUTOMOC TRUE) -target_link_libraries(empty no_link_language) -add_library(no_link_language STATIC empty.h) -set_target_properties(no_link_language PROPERTIES AUTOMOC TRUE) -# Pass Qt compiler features to targets that don't link against Qt -target_compile_features(no_link_language PRIVATE ${QT_COMPILE_FEATURES}) -target_compile_features(empty PRIVATE ${QT_COMPILE_FEATURES}) - - -# -- Test # Test for SKIP_AUTOMOC and SKIP_AUTOGEN on an AUTOMOC enabled target if(ALLOW_WRAP_CPP) # Generate header mocs manually diff --git a/Tests/QtAutogen/CommonTests.cmake b/Tests/QtAutogen/CommonTests.cmake index 0950062..f998b74 100644 --- a/Tests/QtAutogen/CommonTests.cmake +++ b/Tests/QtAutogen/CommonTests.cmake @@ -6,3 +6,4 @@ if(QT_TEST_ALLOW_QT_MACROS) endif() ADD_AUTOGEN_TEST(RccOnly rccOnly) ADD_AUTOGEN_TEST(RccEmpty rccEmpty) +ADD_AUTOGEN_TEST(RccOffMocLibrary) diff --git a/Tests/QtAutogen/RccOffMocLibrary/CMakeLists.txt b/Tests/QtAutogen/RccOffMocLibrary/CMakeLists.txt new file mode 100644 index 0000000..7f7432e --- /dev/null +++ b/Tests/QtAutogen/RccOffMocLibrary/CMakeLists.txt @@ -0,0 +1,17 @@ +cmake_minimum_required(VERSION 3.10) +project(RccOffMocLibrary) +include("../AutogenTest.cmake") + +# 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 +# have an effect on generation if AUTORCC is off. +add_library(empty STATIC empty.cpp not_generated_file.qrc) +set_target_properties(empty PROPERTIES AUTORCC OFF) +set_target_properties(empty PROPERTIES AUTOMOC TRUE) +target_link_libraries(empty no_link_language) +add_library(no_link_language STATIC empty.h) +set_target_properties(no_link_language PROPERTIES AUTOMOC TRUE) +# Pass Qt compiler features to targets that don't link against Qt +target_compile_features(no_link_language PRIVATE ${QT_COMPILE_FEATURES}) +target_compile_features(empty PRIVATE ${QT_COMPILE_FEATURES}) diff --git a/Tests/QtAutogen/RccOffMocLibrary/empty.cpp b/Tests/QtAutogen/RccOffMocLibrary/empty.cpp new file mode 100644 index 0000000..ab32cf6 --- /dev/null +++ b/Tests/QtAutogen/RccOffMocLibrary/empty.cpp @@ -0,0 +1 @@ +// No content diff --git a/Tests/QtAutogen/RccOffMocLibrary/empty.h b/Tests/QtAutogen/RccOffMocLibrary/empty.h new file mode 100644 index 0000000..6bdd2ac --- /dev/null +++ b/Tests/QtAutogen/RccOffMocLibrary/empty.h @@ -0,0 +1,9 @@ + +#include + +class Empty : public QObject +{ + Q_OBJECT +public: + explicit Empty(QObject* parent = 0) {} +}; diff --git a/Tests/QtAutogen/RccOffMocLibrary/not_generated_file.qrc b/Tests/QtAutogen/RccOffMocLibrary/not_generated_file.qrc new file mode 100644 index 0000000..c769834 --- /dev/null +++ b/Tests/QtAutogen/RccOffMocLibrary/not_generated_file.qrc @@ -0,0 +1,5 @@ + + + abc.cpp + + diff --git a/Tests/QtAutogen/empty.cpp b/Tests/QtAutogen/empty.cpp deleted file mode 100644 index ab32cf6..0000000 --- a/Tests/QtAutogen/empty.cpp +++ /dev/null @@ -1 +0,0 @@ -// No content diff --git a/Tests/QtAutogen/empty.h b/Tests/QtAutogen/empty.h deleted file mode 100644 index 6bdd2ac..0000000 --- a/Tests/QtAutogen/empty.h +++ /dev/null @@ -1,9 +0,0 @@ - -#include - -class Empty : public QObject -{ - Q_OBJECT -public: - explicit Empty(QObject* parent = 0) {} -}; diff --git a/Tests/QtAutogen/not_generated_file.qrc b/Tests/QtAutogen/not_generated_file.qrc deleted file mode 100644 index c769834..0000000 --- a/Tests/QtAutogen/not_generated_file.qrc +++ /dev/null @@ -1,5 +0,0 @@ - - - abc.cpp - - -- cgit v0.12