diff options
| author | Juha Vuolle <juha.vuolle@insta.fi> | 2021-12-29 16:57:27 +0200 |
|---|---|---|
| committer | Juha Vuolle <juha.vuolle@insta.fi> | 2022-01-11 17:56:36 +0200 |
| commit | 479e24911f3b6e3bba4da2335ad77f346b31d387 (patch) | |
| tree | 79c303dff30dade2c229a6d92b2be5564dfa365e | |
| parent | 3b0f75a3b766ce2c78e33cb8845b6f02d727afff (diff) | |
Re-enable cmake build test for qtcharts
Task-number: QTBUG-92967
Pick-to: 6.2 6.3
Change-Id: Ibab74adf02eefed290b60ed046172d728ab72de9
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | tests/auto/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/auto/cmake/CMakeLists.txt | 42 |
2 files changed, 37 insertions, 7 deletions
diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt index 032035cb..13344dc1 100644 --- a/tests/auto/CMakeLists.txt +++ b/tests/auto/CMakeLists.txt @@ -23,7 +23,7 @@ add_subdirectory(qcategoryaxis) add_subdirectory(qbarcategoryaxis) add_subdirectory(qlegend) add_subdirectory(qareaseries) -# add_subdirectory(cmake) # special case +add_subdirectory(cmake) add_subdirectory(qcandlestickmodelmapper) add_subdirectory(qcandlestickseries) add_subdirectory(qcandlestickset) diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt index 6c8b1122..90b239a7 100644 --- a/tests/auto/cmake/CMakeLists.txt +++ b/tests/auto/cmake/CMakeLists.txt @@ -1,14 +1,44 @@ +# This is an automatic test for the CMake configuration files. +# To run it manually, +# 1) mkdir build # Create a build directory +# 2) cd build +# 3) # Run cmake on this directory +# `$qt_prefix/bin/qt-cmake ..` or `cmake -DCMAKE_PREFIX_PATH=/path/to/qt ..` +# 4) ctest # Run ctest cmake_minimum_required(VERSION 3.16) +project(charts_cmake_tests) +enable_testing() -project(qmake_cmake_files) +set(required_packages Core Charts) -enable_testing() +# Setup the test when called as a completely standalone project. +if(TARGET Qt6::Core) + # Tests are built as part of the repository's build tree. + # Setup paths so that the Qt packages are found. + qt_internal_set_up_build_dir_package_paths() +endif() + +find_package(Qt6 REQUIRED COMPONENTS ${required_packages}) -find_package(Qt5Core REQUIRED) +# Setup common test variables which were previously set by ctest_testcase_common.prf. +set(CMAKE_MODULES_UNDER_TEST "${required_packages}") -include("${_Qt5CTestMacros}") +foreach(qt_package ${CMAKE_MODULES_UNDER_TEST}) + set(package_name "${QT_CMAKE_EXPORT_NAMESPACE}${qt_package}") + if(${package_name}_FOUND) + set(CMAKE_${qt_package}_MODULE_MAJOR_VERSION "${${package_name}_VERSION_MAJOR}") + set(CMAKE_${qt_package}_MODULE_MINOR_VERSION "${${package_name}_VERSION_MINOR}") + set(CMAKE_${qt_package}_MODULE_PATCH_VERSION "${${package_name}_VERSION_PATCH}") + endif() +endforeach() + +include("${_Qt6CTestMacros}") + +set(module_includes + Charts QChartView +) -test_module_includes( - Charts QChartView +_qt_internal_test_module_includes( + ${module_includes} ) |