From 7052af9d4a4e71f52e98a24969c38e8eb86f317b Mon Sep 17 00:00:00 2001 From: Sebastian Holtermann Date: Fri, 25 Nov 2016 13:39:12 +0100 Subject: QtAutogen tests: Move independent sameName test to top list of CMakeLists.txt --- Tests/QtAutogen/CMakeLists.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt index 6a5d7b5..a499acc 100644 --- a/Tests/QtAutogen/CMakeLists.txt +++ b/Tests/QtAutogen/CMakeLists.txt @@ -60,6 +60,10 @@ add_executable(uicOnly uicOnlySource/uiconly.cpp ${uicOnlyMoc}) set_property(TARGET uicOnly PROPERTY AUTOUIC ON) target_link_libraries(uicOnly ${QT_LIBRARIES}) +# -- Test: AUTOMOC and AUTORCC on source files with the same name +# but in different subdirectories +add_subdirectory(sameName) + include_directories(${CMAKE_CURRENT_BINARY_DIR}) add_definitions(-DFOO -DSomeDefine="Barx") @@ -121,9 +125,6 @@ set_target_properties( AUTOMOC TRUE ) -# Test AUTOMOC and AUTORCC on source files with the same name -# but in different subdirectories -add_subdirectory(sameName) include(GenerateExportHeader) # The order is relevant here. B depends on A, and B headers depend on A -- cgit v0.12