From effd6f63f1a4b7dc7b5e6bca41594f1d1562a713 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 2 Aug 2022 14:22:54 +0200 Subject: [PATCH] CMake: Fix single standalone tests to use same Qt C++ language std MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When using qt-cmake-standalone-test, we didn't tell CMake to use the same C++ language standard that Qt used when it was configured. We did tell CMake to do that when configuring tests with qt-internal-configure-tests via the qt_build_tests macro. To ensure the proper standard is set, we also need to find_package(Qt6Core), because the std flag is derived from the QT_FEATURE_cxxyz flag which is set by Core. Change-Id: Ia41f2a24983ddab0107a6446743f7b054df8c033 Pick-to: 6.2 6.3 6.4 Reviewed-by: Oliver Wolff Reviewed-by: Jörg Bornemann --- .../QtStandaloneTestTemplateProject/CMakeLists.txt | 2 +- .../QtStandaloneTestTemplateProject/Main.cmake | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/cmake/QtBuildInternals/QtStandaloneTestTemplateProject/CMakeLists.txt b/cmake/QtBuildInternals/QtStandaloneTestTemplateProject/CMakeLists.txt index d3f7ec0b9b0..1f7425982bc 100644 --- a/cmake/QtBuildInternals/QtStandaloneTestTemplateProject/CMakeLists.txt +++ b/cmake/QtBuildInternals/QtStandaloneTestTemplateProject/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.16) project(qt_single_test VERSION 6.0.0 LANGUAGES C CXX ASM) -find_package(Qt6 REQUIRED COMPONENTS BuildInternals) +find_package(Qt6 REQUIRED COMPONENTS BuildInternals Core) include(${CMAKE_CURRENT_LIST_DIR}/Main.cmake) diff --git a/cmake/QtBuildInternals/QtStandaloneTestTemplateProject/Main.cmake b/cmake/QtBuildInternals/QtStandaloneTestTemplateProject/Main.cmake index 312a9117272..77e0148a0c6 100644 --- a/cmake/QtBuildInternals/QtStandaloneTestTemplateProject/Main.cmake +++ b/cmake/QtBuildInternals/QtStandaloneTestTemplateProject/Main.cmake @@ -15,6 +15,10 @@ foreach(file ${config_files}) include("${file}") endforeach() +# Set language standards after finding Core, because that's when the relevant +# feature variables are available. +qt_set_language_standards() + # Just before adding the test, change the local (non-cache) install prefix to something other than # the Qt install prefix, so that tests don't try to install and pollute the Qt install prefix. # Needs to be called after qt_get_standalone_tests_confg_files_path().