From b82737367dde1ab41a96ee0394f4500cfa523e2a Mon Sep 17 00:00:00 2001 From: Martin Negyokru Date: Thu, 7 Apr 2022 13:09:26 +0200 Subject: Adapt Qt-style cmake for manual tests The tests can built with qt-cmake-standalone-test. Make then directly openable in Creator. Pick-to: 6.3 6.2 Change-Id: Iceae2305912d3854959b3a266d19d3e7344557e7 Reviewed-by: Michal Klocek --- tests/manual/CMakeLists.txt | 3 -- tests/manual/quick/touchbrowser/CMakeLists.txt | 51 +++++++------------- tests/manual/widgets/inputmethods/CMakeLists.txt | 59 ++++++++---------------- tests/manual/widgets/webgl/CMakeLists.txt | 47 ++++++------------- 4 files changed, 50 insertions(+), 110 deletions(-) (limited to 'tests') diff --git a/tests/manual/CMakeLists.txt b/tests/manual/CMakeLists.txt index 7fc300b52..c6d3e6e50 100644 --- a/tests/manual/CMakeLists.txt +++ b/tests/manual/CMakeLists.txt @@ -1,5 +1,2 @@ -cmake_minimum_required(VERSION 3.16) -project(manual LANGUAGES CXX) - add_subdirectory(quick) add_subdirectory(widgets) diff --git a/tests/manual/quick/touchbrowser/CMakeLists.txt b/tests/manual/quick/touchbrowser/CMakeLists.txt index 64885fd5d..c211ba8e6 100644 --- a/tests/manual/quick/touchbrowser/CMakeLists.txt +++ b/tests/manual/quick/touchbrowser/CMakeLists.txt @@ -1,39 +1,26 @@ -cmake_minimum_required(VERSION 3.16) -project(touchbrowser LANGUAGES CXX) - -set(CMAKE_CXX_STANDARD 17) -set(CMAKE_CXX_STANDARD_REQUIRED ON) - -set(CMAKE_AUTOMOC ON) - -if(NOT DEFINED INSTALL_MANUAL_TESTSDIR) - set(INSTALL_MANUAL_TESTSDIR "manual") +if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(touchbrowser LANGUAGES CXX) + find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST) endif() -set(INSTALL_MANUAL_TESTDIR "${INSTALL_MANUAL_TESTSDIR}/quick/touchbrowser") - if(NOT CMAKE_CROSSCOMPILING) add_definitions(-DDESKTOP_BUILD) set(SOURCES "touchmockingapplication.cpp") endif() -find_package(Qt6 REQUIRED COMPONENTS Quick WebEngineQuick Gui) - -qt_add_executable(touchbrowser - main.cpp - utils.h - ${SOURCES} -) - -set_target_properties(touchbrowser PROPERTIES - WIN32_EXECUTABLE TRUE - MACOSX_BUNDLE TRUE -) - -target_link_libraries(touchbrowser PRIVATE - Qt::GuiPrivate - Qt::Quick - Qt::WebEngineQuick +qt_internal_add_manual_test(touchbrowser + GUI + SOURCES + main.cpp + utils.h + ${SOURCES} + PUBLIC_LIBRARIES + Qt::GuiPrivate + Qt::Quick + Qt::WebEngineQuick + ENABLE_AUTOGEN_TOOLS + moc ) set(touchbrowser_resource_files @@ -49,9 +36,3 @@ qt_add_resources(touchbrowser "touchbrowser" FILES ${touchbrowser_resource_files} ) - -install(TARGETS touchbrowser - RUNTIME DESTINATION "${INSTALL_MANUAL_TESTDIR}" - BUNDLE DESTINATION "${INSTALL_MANUAL_TESTDIR}" - LIBRARY DESTINATION "${INSTALL_MANUAL_TESTDIR}" -) diff --git a/tests/manual/widgets/inputmethods/CMakeLists.txt b/tests/manual/widgets/inputmethods/CMakeLists.txt index af1b85c3b..4bc6e76db 100644 --- a/tests/manual/widgets/inputmethods/CMakeLists.txt +++ b/tests/manual/widgets/inputmethods/CMakeLists.txt @@ -1,38 +1,25 @@ -cmake_minimum_required(VERSION 3.16) -project(inputmethods LANGUAGES CXX) - -set(CMAKE_CXX_STANDARD 17) -set(CMAKE_CXX_STANDARD_REQUIRED ON) - -set(CMAKE_AUTOMOC ON) - -if(NOT DEFINED INSTALL_MANUAL_TESTSDIR) - set(INSTALL_MANUAL_TESTSDIR "manual") +if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(inputmethods LANGUAGES CXX) + find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST) endif() -set(INSTALL_MANUAL_TESTDIR "${INSTALL_MANUAL_TESTSDIR}/widgets/inputmethods") - -find_package(Qt6 REQUIRED COMPONENTS Core Gui WebEngineWidgets Test) - -qt_add_executable(inputmethods - colorpicker.cpp - controlview.cpp - main.cpp - referenceview.cpp - testview.cpp - webview.cpp -) - -set_target_properties(inputmethods PROPERTIES - WIN32_EXECUTABLE TRUE - MACOSX_BUNDLE TRUE -) - -target_link_libraries(inputmethods PRIVATE - Qt::Core - Qt::Gui - Qt::Test - Qt::WebEngineWidgets +qt_internal_add_manual_test(inputmethods + GUI + SOURCES + colorpicker.cpp + controlview.cpp + main.cpp + referenceview.cpp + testview.cpp + webview.cpp + PUBLIC_LIBRARIES + Qt::Core + Qt::Gui + Qt::Test + Qt::WebEngineWidgets + ENABLE_AUTOGEN_TOOLS + moc ) set(inputmethods_resource_files @@ -45,9 +32,3 @@ qt_add_resources(inputmethods "inputmethods" FILES ${inputmethods_resource_files} ) - -install(TARGETS inputmethods - RUNTIME DESTINATION "${INSTALL_MANUAL_TESTDIR}" - BUNDLE DESTINATION "${INSTALL_MANUAL_TESTDIR}" - LIBRARY DESTINATION "${INSTALL_MANUAL_TESTDIR}" -) diff --git a/tests/manual/widgets/webgl/CMakeLists.txt b/tests/manual/widgets/webgl/CMakeLists.txt index 2729cdc0c..9eaa50c00 100644 --- a/tests/manual/widgets/webgl/CMakeLists.txt +++ b/tests/manual/widgets/webgl/CMakeLists.txt @@ -1,36 +1,17 @@ -cmake_minimum_required(VERSION 3.16) -project(webgl LANGUAGES CXX) - -set(CMAKE_CXX_STANDARD 17) -set(CMAKE_CXX_STANDARD_REQUIRED ON) - -set(CMAKE_AUTOMOC ON) - -if(NOT DEFINED INSTALL_MANUAL_TESTSDIR) - set(INSTALL_MANUAL_TESTSDIR "manual") +if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(webgl LANGUAGES CXX) + find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST) endif() -set(INSTALL_MANUAL_TESTDIR "${INSTALL_MANUAL_TESTSDIR}/widgets/webgl") - -find_package(Qt6 REQUIRED COMPONENTS Core Gui WebEngineWidgets) - -qt_add_executable(webgl - main.cpp -) - -set_target_properties(webgl PROPERTIES - WIN32_EXECUTABLE TRUE - MACOSX_BUNDLE TRUE -) - -target_link_libraries(webgl PRIVATE - Qt::Core - Qt::Gui - Qt::WebEngineWidgets -) - -install(TARGETS webgl - RUNTIME DESTINATION "${INSTALL_MANUAL_TESTDIR}" - BUNDLE DESTINATION "${INSTALL_MANUAL_TESTDIR}" - LIBRARY DESTINATION "${INSTALL_MANUAL_TESTDIR}" +qt_internal_add_manual_test(webgl + GUI + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Core + Qt::Gui + Qt::WebEngineWidgets + ENABLE_AUTOGEN_TOOLS + moc ) -- cgit v1.2.3