From a47c5e3e432da2e06dc60815f0fb8f7f55f3fdb2 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Tue, 5 Dec 2023 16:51:05 +0100 Subject: [PATCH] Fix encapsulation of qt_build_internals_add_toplevel_targets The function uses external non-cache variable that is set in different cmake macro. It's better to pass the value as argument. Pick-to: 6.5 Change-Id: I282bd506cf2dcd998a0ddd7deaad244fab34a8db Reviewed-by: Joerg Bornemann (cherry picked from commit 0d7cda9cdaeefe8363f44204b0cb7384ec990dc8) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 8bed1089c51a0281a3fdb128b6275c120e32cca2) --- cmake/QtBuildRepoHelpers.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/QtBuildRepoHelpers.cmake b/cmake/QtBuildRepoHelpers.cmake index f02d8466385..ef9cd137085 100644 --- a/cmake/QtBuildRepoHelpers.cmake +++ b/cmake/QtBuildRepoHelpers.cmake @@ -32,7 +32,7 @@ macro(qt_build_internals_set_up_private_api) endmacro() # add toplevel targets for each subdirectory, e.g. qtbase_src -function(qt_build_internals_add_toplevel_targets) +function(qt_build_internals_add_toplevel_targets qt_repo_targets_name) set(qt_repo_target_all "") get_directory_property(directories DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" SUBDIRECTORIES) foreach(directory IN LISTS directories) @@ -333,7 +333,7 @@ macro(qt_build_repo_end) endif() endif() - qt_build_internals_add_toplevel_targets() + qt_build_internals_add_toplevel_targets(${qt_repo_targets_name}) if(NOT QT_SUPERBUILD) qt_print_build_instructions()