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 6.6 6.7 Change-Id: I282bd506cf2dcd998a0ddd7deaad244fab34a8db Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
parent
ae3506d80e
commit
0d7cda9cda
@ -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()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user