From c09bcfbdf0232f8b827fc2a4dd19ca433a62df5f Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Wed, 12 May 2021 11:12:49 +0200 Subject: cmake: Enable all autogenerated autotests again Change-Id: I727c5fcc7db89a1e24912d5ade61ca5a7e613543 Reviewed-by: Qt CI Bot Reviewed-by: Robert Griebl --- .../include-test/backend_simulator/CMakeLists.txt | 1 + .../projects/include-test/common/CMakeLists.txt | 1 + .../projects/include-test/frontend/CMakeLists.txt | 1 + .../projects/include-test/test/CMakeLists.txt | 28 ++++++++++----------- .../backend_simulator/CMakeLists.txt | 1 + .../frontend/CMakeLists.txt | 1 + .../org-example-echo-noanno/test/CMakeLists.txt | 20 ++++++++------- .../backend_simulator/CMakeLists.txt | 1 + .../frontend/CMakeLists.txt | 1 + .../org-example-echo-noprivate/test/CMakeLists.txt | 24 ++++++++---------- .../backend_qtro/CMakeLists.txt | 2 +- .../org-example-echo-qtro/frontend/CMakeLists.txt | 1 + .../server_qtro_test/CMakeLists.txt | 29 +++++++++++----------- .../backend_simulator/CMakeLists.txt | 1 + .../org-example-echo/frontend/CMakeLists.txt | 1 + .../projects/org-example-echo/test/CMakeLists.txt | 24 ++++++++---------- tests/auto/vehiclefunctions/basic/CMakeLists.txt | 27 ++++++++++---------- 17 files changed, 85 insertions(+), 79 deletions(-) diff --git a/tests/auto/core/ivigenerator/projects/include-test/backend_simulator/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/include-test/backend_simulator/CMakeLists.txt index ec5434d..d745744 100644 --- a/tests/auto/core/ivigenerator/projects/include-test/backend_simulator/CMakeLists.txt +++ b/tests/auto/core/ivigenerator/projects/include-test/backend_simulator/CMakeLists.txt @@ -6,6 +6,7 @@ set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) qt_add_plugin(include_test_simulator) +set_target_properties(include_test_simulator PROPERTIES LIBRARY_OUTPUT_DIRECTORY ../qtivi) # IVI Generator: qt6_ivigenerator(include_test_simulator diff --git a/tests/auto/core/ivigenerator/projects/include-test/common/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/include-test/common/CMakeLists.txt index 6582d44..992d6cb 100644 --- a/tests/auto/core/ivigenerator/projects/include-test/common/CMakeLists.txt +++ b/tests/auto/core/ivigenerator/projects/include-test/common/CMakeLists.txt @@ -6,6 +6,7 @@ set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) add_library(include_test_common) +set_target_properties(include_test_common PROPERTIES RUNTIME_OUTPUT_DIRECTORY ../) # IVI Generator: qt6_ivigenerator(include_test_common diff --git a/tests/auto/core/ivigenerator/projects/include-test/frontend/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/include-test/frontend/CMakeLists.txt index 1485e00..9890ce2 100644 --- a/tests/auto/core/ivigenerator/projects/include-test/frontend/CMakeLists.txt +++ b/tests/auto/core/ivigenerator/projects/include-test/frontend/CMakeLists.txt @@ -6,6 +6,7 @@ set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) add_library(include_test_frontend) +set_target_properties(include_test_frontend PROPERTIES RUNTIME_OUTPUT_DIRECTORY ../) # IVI Generator: qt6_ivigenerator(include_test_frontend diff --git a/tests/auto/core/ivigenerator/projects/include-test/test/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/include-test/test/CMakeLists.txt index 5bd474a..1d0b134 100644 --- a/tests/auto/core/ivigenerator/projects/include-test/test/CMakeLists.txt +++ b/tests/auto/core/ivigenerator/projects/include-test/test/CMakeLists.txt @@ -5,24 +5,22 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -qt_add_executable(tst_include) +file(TOUCH ${CMAKE_CURRENT_BINARY_DIR}/cmake_dummy.cpp) +qt_add_test(tst_qface_include + SOURCES + ${CMAKE_CURRENT_BINARY_DIR}/cmake_dummy.cpp + PUBLIC_LIBRARIES + include_test_common + include_test_frontend + Qt::Core + Qt::IviCore + Qt::Test +) +set_target_properties(tst_qface_include PROPERTIES RUNTIME_OUTPUT_DIRECTORY ../) # IVI Generator: -qt6_ivigenerator(tst_include +qt6_ivigenerator(tst_qface_include QFACE_SOURCES ../../../include-test.qface QFACE_FORMAT test QFACE_IMPORT_PATH ../../../qface\ imports ) -set_target_properties(tst_include PROPERTIES - WIN32_EXECUTABLE TRUE - MACOSX_BUNDLE TRUE -) - -target_link_libraries(tst_include PUBLIC - include_test_common - include_test_frontend - Qt::Core - Qt::Gui - Qt::IviCore - Qt::Test -) diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/backend_simulator/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/backend_simulator/CMakeLists.txt index 8390845..3853fd9 100644 --- a/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/backend_simulator/CMakeLists.txt +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/backend_simulator/CMakeLists.txt @@ -6,6 +6,7 @@ set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) qt_add_plugin(echo_noanno_simulator) +set_target_properties(echo_noanno_simulator PROPERTIES LIBRARY_OUTPUT_DIRECTORY ../qtivi) # IVI Generator: qt6_ivigenerator(echo_noanno_simulator diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/frontend/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/frontend/CMakeLists.txt index c0162a1..284b1c2 100644 --- a/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/frontend/CMakeLists.txt +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/frontend/CMakeLists.txt @@ -6,6 +6,7 @@ set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) add_library(echo_noanno_frontend) +set_target_properties(echo_noanno_frontend PROPERTIES RUNTIME_OUTPUT_DIRECTORY ../) # IVI Generator: qt6_ivigenerator(echo_noanno_frontend diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/test/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/test/CMakeLists.txt index 604d87c..7f3de43 100644 --- a/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/test/CMakeLists.txt +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-noanno/test/CMakeLists.txt @@ -5,18 +5,20 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -qt_add_executable(tst_org-example-echo-noanno) +file(TOUCH ${CMAKE_CURRENT_BINARY_DIR}/cmake_dummy.cpp) +qt_add_test(tst_org-example-echo-noanno + SOURCES + ${CMAKE_CURRENT_BINARY_DIR}/cmake_dummy.cpp + PUBLIC_LIBRARIES + echo_noanno_frontend + Qt::Core + Qt::IviCore + Qt::Test +) +set_target_properties(tst_org-example-echo-noanno PROPERTIES RUNTIME_OUTPUT_DIRECTORY ../) # IVI Generator: qt6_ivigenerator(tst_org-example-echo-noanno QFACE_SOURCES ../../../org.example.echo.noannotation.qface QFACE_FORMAT test ) - -target_link_libraries(tst_org-example-echo-noanno PUBLIC - echo_noanno_frontend - Qt::Core - Qt::Gui - Qt::IviCore - Qt::Test -) diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/backend_simulator/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/backend_simulator/CMakeLists.txt index d0827bd..1817627 100644 --- a/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/backend_simulator/CMakeLists.txt +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/backend_simulator/CMakeLists.txt @@ -6,6 +6,7 @@ set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) qt_add_plugin(echo_noprivate_simulator) +set_target_properties(echo_noprivate_simulator PROPERTIES LIBRARY_OUTPUT_DIRECTORY ../qtivi) # IVI Generator: qt6_ivigenerator(echo_noprivate_simulator diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/frontend/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/frontend/CMakeLists.txt index e0bb60e..9a51872 100644 --- a/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/frontend/CMakeLists.txt +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/frontend/CMakeLists.txt @@ -6,6 +6,7 @@ set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) add_library(echo_noprivate_frontend) +set_target_properties(echo_noprivate_frontend PROPERTIES RUNTIME_OUTPUT_DIRECTORY ../) # IVI Generator: qt6_ivigenerator(echo_noprivate_frontend diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/test/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/test/CMakeLists.txt index 16622b2..812dbd4 100644 --- a/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/test/CMakeLists.txt +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/test/CMakeLists.txt @@ -5,7 +5,17 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -qt_add_executable(tst_org-example-echo-noprivate) +file(TOUCH ${CMAKE_CURRENT_BINARY_DIR}/cmake_dummy.cpp) +qt_add_test(tst_org-example-echo-noprivate + SOURCES + ${CMAKE_CURRENT_BINARY_DIR}/cmake_dummy.cpp + PUBLIC_LIBRARIES + echo_noprivate_frontend + Qt::Core + Qt::IviCore + Qt::Test +) +set_target_properties(tst_org-example-echo-noprivate PROPERTIES RUNTIME_OUTPUT_DIRECTORY ../) # IVI Generator: qt6_ivigenerator(tst_org-example-echo-noprivate @@ -13,15 +23,3 @@ qt6_ivigenerator(tst_org-example-echo-noprivate QFACE_FORMAT test QFACE_ANNOTATIONS ../../../no-private.yaml ) -set_target_properties(tst_org-example-echo-noprivate PROPERTIES - WIN32_EXECUTABLE TRUE - MACOSX_BUNDLE TRUE -) - -target_link_libraries(tst_org-example-echo-noprivate PUBLIC - echo_noprivate_frontend - Qt::Core - Qt::Gui - Qt::IviCore - Qt::Test -) diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/backend_qtro/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/backend_qtro/CMakeLists.txt index aaac430..f846e8c 100644 --- a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/backend_qtro/CMakeLists.txt +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/backend_qtro/CMakeLists.txt @@ -6,6 +6,7 @@ set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) qt_add_plugin(echo_backend_qtro) +set_target_properties(echo_backend_qtro PROPERTIES LIBRARY_OUTPUT_DIRECTORY ../qtivi) # IVI Generator: qt6_ivigenerator(echo_backend_qtro @@ -14,7 +15,6 @@ qt6_ivigenerator(echo_backend_qtro ) target_link_libraries(echo_backend_qtro PUBLIC - # Remove: L${CMAKE_CURRENT_BINARY_DIR}/.. echo_qtro_frontend Qt::Core Qt::Gui diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/frontend/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/frontend/CMakeLists.txt index d55b1f2..34d5eac 100644 --- a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/frontend/CMakeLists.txt +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/frontend/CMakeLists.txt @@ -6,6 +6,7 @@ set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) add_library(echo_qtro_frontend) +set_target_properties(echo_qtro_frontend PROPERTIES RUNTIME_OUTPUT_DIRECTORY ../) # IVI Generator: qt6_ivigenerator(echo_qtro_frontend diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/CMakeLists.txt index e248ff3..2d990b2 100644 --- a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/CMakeLists.txt +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/CMakeLists.txt @@ -5,26 +5,25 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -qt_add_executable(tst_org-example-echo-qtro +qt_add_test(tst_org-example-echo-qtro SOURCES - contactsmodelservice.cpp contactsmodelservice.h - echoservice.cpp echoservice.h - echozonedservice.cpp echozonedservice.h - main.cpp - server.cpp server.h - tst_echoqtro.cpp tst_echoqtro.h + contactsmodelservice.cpp contactsmodelservice.h + echoservice.cpp echoservice.h + echozonedservice.cpp echozonedservice.h + main.cpp + server.cpp server.h + tst_echoqtro.cpp tst_echoqtro.h + PUBLIC_LIBRARIES + echo_qtro_frontend + Qt::Core + Qt::IviCore + Qt::Test + Qt::IviRemoteObjectsHelper ) +set_target_properties(tst_org-example-echo-qtro PROPERTIES RUNTIME_OUTPUT_DIRECTORY ../) # IVI Generator: qt6_ivigenerator(tst_org-example-echo-qtro QFACE_SOURCES ../../../org.example.echo.qface QFACE_FORMAT server_qtro ) - -target_link_libraries(tst_org-example-echo-qtro PUBLIC - echo_qtro_frontend - Qt::Core - Qt::IviCore - Qt::Test - Qt::IviRemoteObjectsHelper -) diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo/backend_simulator/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo/backend_simulator/CMakeLists.txt index a6e95bd..4bafbb8 100644 --- a/tests/auto/core/ivigenerator/projects/org-example-echo/backend_simulator/CMakeLists.txt +++ b/tests/auto/core/ivigenerator/projects/org-example-echo/backend_simulator/CMakeLists.txt @@ -6,6 +6,7 @@ set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) qt_add_plugin(echo_simulator) +set_target_properties(echo_simulator PROPERTIES LIBRARY_OUTPUT_DIRECTORY ../qtivi) target_sources(echo_simulator PRIVATE backend_simulator.cpp ) diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo/frontend/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo/frontend/CMakeLists.txt index 6b2f7a8..a8f6d98 100644 --- a/tests/auto/core/ivigenerator/projects/org-example-echo/frontend/CMakeLists.txt +++ b/tests/auto/core/ivigenerator/projects/org-example-echo/frontend/CMakeLists.txt @@ -6,6 +6,7 @@ set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) add_library(echo_frontend) +set_target_properties(echo_frontend PROPERTIES RUNTIME_OUTPUT_DIRECTORY ../) # IVI Generator: qt6_ivigenerator(echo_frontend diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo/test/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo/test/CMakeLists.txt index ea42d2d..b480d5f 100644 --- a/tests/auto/core/ivigenerator/projects/org-example-echo/test/CMakeLists.txt +++ b/tests/auto/core/ivigenerator/projects/org-example-echo/test/CMakeLists.txt @@ -5,22 +5,20 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -qt_add_executable(tst_org-example-echo) +file(TOUCH ${CMAKE_CURRENT_BINARY_DIR}/cmake_dummy.cpp) +qt_add_test(tst_org-example-echo + SOURCES + ${CMAKE_CURRENT_BINARY_DIR}/cmake_dummy.cpp + PUBLIC_LIBRARIES + echo_frontend + Qt::Core + Qt::IviCore + Qt::Test +) +set_target_properties(tst_org-example-echo PROPERTIES RUNTIME_OUTPUT_DIRECTORY ../) # IVI Generator: qt6_ivigenerator(tst_org-example-echo QFACE_SOURCES ../../../org.example.echo.qface QFACE_FORMAT test ) -set_target_properties(tst_org-example-echo PROPERTIES - WIN32_EXECUTABLE TRUE - MACOSX_BUNDLE TRUE -) - -target_link_libraries(tst_org-example-echo PUBLIC - echo_frontend - Qt::Core - Qt::Gui - Qt::IviCore - Qt::Test -) diff --git a/tests/auto/vehiclefunctions/basic/CMakeLists.txt b/tests/auto/vehiclefunctions/basic/CMakeLists.txt index 06c8cf0..1b50edd 100644 --- a/tests/auto/vehiclefunctions/basic/CMakeLists.txt +++ b/tests/auto/vehiclefunctions/basic/CMakeLists.txt @@ -1,23 +1,24 @@ # Generated from basic.pro. ##################################################################### -## tst_basic Test: +## tst_vehiclefunctions_basic Test: ##################################################################### -# FIXME: The templates needs to be adapted to enable this -#qt_add_test(tst_basic -# PUBLIC_LIBRARIES -# Qt::Gui -# Qt::IviCore -# Qt::IviVehicleFunctions -# SOURCES "" -#) +file(TOUCH ${CMAKE_CURRENT_BINARY_DIR}/cmake_dummy.cpp) +qt_add_test(tst_vehiclefunctions_basic + SOURCES + ${CMAKE_CURRENT_BINARY_DIR}/cmake_dummy.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::IviCore + Qt::IviVehicleFunctions +) # IVI Generator: -#qt_ivigenerator(tst_basic -# QFACE_SOURCES ../../../../src/ivivehiclefunctions/ivivehiclefunctions.qface -# QFACE_FORMAT test -#) +qt_ivigenerator(tst_vehiclefunctions_basic + QFACE_SOURCES ../../../../src/ivivehiclefunctions/ivivehiclefunctions.qface + QFACE_FORMAT test +) #### Keys ignored in scope 1:.:.:basic.pro:: # QMAKE_PROJECT_NAME = "$$TARGET" -- cgit v1.2.3