From 741b5c6b51a17bc87fd898d056e5dbb6ccd1efc7 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Wed, 26 Apr 2023 16:00:58 +0200 Subject: [PATCH] Make the colorresolving benchmark also a benchmark for cmake Using qt_internal_add_test for a benchmark gives it a _check target, not a _benchmark target. Use qt_internal_add_benchmark instead, link against QuickTest, and set the QUICK_TEST_SOURCE_DIR variable explicitly. Pick-to: 6.5 Change-Id: Id72f2623b7edaa538ef3ff2cb3f505506652ee5a Reviewed-by: Joerg Bornemann --- .../quick/colorresolving/CMakeLists.txt | 25 ++++++++----------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/tests/benchmarks/quick/colorresolving/CMakeLists.txt b/tests/benchmarks/quick/colorresolving/CMakeLists.txt index 572d02767a..082897799c 100644 --- a/tests/benchmarks/quick/colorresolving/CMakeLists.txt +++ b/tests/benchmarks/quick/colorresolving/CMakeLists.txt @@ -7,25 +7,20 @@ ## tst_colorresolving Test: ##################################################################### -# Collect test data -file(GLOB_RECURSE test_data_glob - RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/data/tst_*) -list(APPEND test_data ${test_data_glob}) - -qt_internal_add_test(tst_colorresolving - GUI - QMLTEST +qt_internal_add_benchmark(tst_colorresolving SOURCES tst_colorresolving.cpp LIBRARIES Qt::Gui - TESTDATA ${test_data} + Qt::QuickTest ) -#### Keys ignored in scope 1:.:.:colorresolving.pro:: -# OTHER_FILES = "$$PWD/data/*.qml" -# TEMPLATE = "app" +qt_internal_extend_target(tst_colorresolving CONDITION NOT ANDROID AND NOT IOS +DEFINES + QUICK_TEST_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}/data" +) -## Scopes: -##################################################################### +qt_internal_extend_target(tst_colorresolving CONDITION ANDROID OR IOS +DEFINES + QUICK_TEST_SOURCE_DIR=":/data" +)