From 68346b2d1ca5a31bbb8f361bafa5d3c8c016dcd2 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 16 May 2025 12:11:20 +0000 Subject: [PATCH] CMake: try to find qmltestrunner from additional paths Use QT_ADDITIONAL_PACKAGES_PREFIX_PATH to look for qmltestrunner. Needed if module install is using separate staging prefix, like is done on Yocto builds. Change-Id: Icfe972a7ab1d0c99518383eab1c885e490cdb4d6 Reviewed-by: Alexandru Croitor --- cmake/QtTestHelpers.cmake | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/cmake/QtTestHelpers.cmake b/cmake/QtTestHelpers.cmake index 64e5f76b360..90281213a82 100644 --- a/cmake/QtTestHelpers.cmake +++ b/cmake/QtTestHelpers.cmake @@ -759,9 +759,17 @@ function(qt_internal_add_test name) elseif(TARGET qmltestrunner) set(qmltestrunner_executable qmltestrunner) else() + set(qt_additional_libexec_paths "") + if(DEFINED QT_ADDITIONAL_PACKAGES_PREFIX_PATH) + foreach(additional_prefix IN LISTS QT_ADDITIONAL_PACKAGES_PREFIX_PATH) + set(additional_libexec "${additional_prefix}/${QT6_INSTALL_LIBEXECS}") + list(PREPEND qt_additional_libexec_paths "${additional_libexec}") + endforeach() + endif() find_program(qmltestrunner_executable NAMES qmltestrunner qmltestrunner.exe PATHS "${QT6_INSTALL_PREFIX}/${QT6_INSTALL_LIBEXECS}" + ${qt_additional_libexec_paths} NO_DEFAULT_PATH ) if(NOT qmltestrunner_executable)