From ed721471494aa5bffbe0a5944f8efbe62884b9b5 Mon Sep 17 00:00:00 2001 From: Juha Vuolle Date: Mon, 19 Apr 2021 11:41:01 +0300 Subject: [PATCH] Fix qtbase cmake autotest The testcase relied on having optional packages, and that the last package in that list was found. Otherwise the version numbers of the found modules were not set. Change-Id: I76743fd029d6eed2f4b347280591e6fdaed19053 Reviewed-by: Qt CI Bot Reviewed-by: Alexandru Croitor --- tests/auto/cmake/CMakeLists.txt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt index acb72537313..1a5bc1f36c7 100644 --- a/tests/auto/cmake/CMakeLists.txt +++ b/tests/auto/cmake/CMakeLists.txt @@ -69,13 +69,10 @@ find_package(Qt6 REQUIRED COMPONENTS ${required_packages}) find_package(Qt6 OPTIONAL_COMPONENTS ${optional_packages}) # Setup common test variables which were previously set by ctest_testcase_common.prf. -set(CMAKE_MODULES_UNDER_TEST "${required_packages}") -foreach(qt_package ${optional_packages}) - set(package_name "${QT_CMAKE_EXPORT_NAMESPACE}${qt_package}") - list(APPEND CMAKE_MODULES_UNDER_TEST "${qt_package}") -endforeach() +set(CMAKE_MODULES_UNDER_TEST "${required_packages}" ${optional_packages}) 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}")