From 5981d44aec5bc09e092310b93f15134ab165d4bd Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Tue, 10 Nov 2020 20:30:29 +0100 Subject: [PATCH] pro2cmake: Add support for standalone CMake test configuration This patchset adds the bits needed for manual tests to work standalone. Amends ebaa1c15a101579d9296336491e36c63b979f18d Pick-to: 6.1 Task-number: QTCREATORBUG-25389 Change-Id: Ifc70391bda2a3eea3c7492a58353a703cdc3114c Reviewed-by: Mitch Curtis Reviewed-by: Alexandru Croitor --- util/cmake/pro2cmake.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py index f17248bf019..65ceacd20c6 100755 --- a/util/cmake/pro2cmake.py +++ b/util/cmake/pro2cmake.py @@ -3193,6 +3193,12 @@ def write_main_part( # collect all testdata and insert globbing commands has_test_data = False if typename == "Test": + cm_fh.write(f"{spaces(indent)}if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)\n") + cm_fh.write(f"{spaces(indent+1)}cmake_minimum_required(VERSION 3.16)\n") + cm_fh.write(f"{spaces(indent+1)}project({name} LANGUAGES C CXX ASM)\n") + cm_fh.write(f"{spaces(indent+1)}find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)\n") + cm_fh.write(f"{spaces(indent)}endif()\n\n") + test_data = scope.expand("TESTDATA") if test_data: has_test_data = True