1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix encapsulation of qt_build_internals_add_toplevel_targets

Browse Source 
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.6 6.5
Change-Id: I282bd506cf2dcd998a0ddd7deaad244fab34a8db
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 0d7cda9cdaeefe8363f44204b0cb7384ec990dc8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Alexey Edelev 2023-12-05 16:51:05 +01:00 committed by Qt Cherry-pick Bot
parent 6c4fe5766e
commit 8bed1089c5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/QtBuildRepoHelpers.cmake
View File

@ -32,7 +32,7 @@ macro(qt_build_internals_set_up_private_api)
endmacro() endmacro()
# add toplevel targets for each subdirectory, e.g. qtbase_src # 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 "") set(qt_repo_target_all "")
get_directory_property(directories DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" SUBDIRECTORIES) get_directory_property(directories DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" SUBDIRECTORIES)
foreach(directory IN LISTS directories) foreach(directory IN LISTS directories)
@ -333,7 +333,7 @@ macro(qt_build_repo_end)
endif() endif()
endif() endif()
qt_build_internals_add_toplevel_targets() qt_build_internals_add_toplevel_targets(${qt_repo_targets_name})
if(NOT QT_SUPERBUILD) if(NOT QT_SUPERBUILD)
qt_print_build_instructions() qt_print_build_instructions()