From ea3289460b6c9a6c4f17af06871936f105514b66 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Thu, 7 Dec 2023 13:54:52 +0100 Subject: [PATCH] Make sure that the result variable is empty in _qt_internal_collect_buildsystem_targets Add the inside-recursion marker to the _qt_internal_collect_buildsystem_targets function and reset the result variable only in the top-level function call. Amends 1c82e92202c8c359872c08095670c121602094b8 Pick-to: 6.5 6.6 Change-Id: I34b1e1edbb8a799900b95f67b80151b372073d2c Reviewed-by: Joerg Bornemann Reviewed-by: Qt CI Bot --- cmake/QtPublicCMakeHelpers.cmake | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cmake/QtPublicCMakeHelpers.cmake b/cmake/QtPublicCMakeHelpers.cmake index d2af1180a15..a3a6c9d71c9 100644 --- a/cmake/QtPublicCMakeHelpers.cmake +++ b/cmake/QtPublicCMakeHelpers.cmake @@ -102,6 +102,11 @@ endfunction() function(_qt_internal_collect_buildsystem_targets result dir) cmake_parse_arguments(arg "" "" "EXCLUDE;INCLUDE" ${ARGN}) + if(NOT _qt_internal_collect_buildsystem_targets_inner) + set(${result} "") + set(_qt_internal_collect_buildsystem_targets_inner TRUE) + endif() + set(forward_args "") if(arg_EXCLUDE) set(forward_args APPEND EXCLUDE ${arg_EXCLUDE})