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

Fix top-level build repository targets

Browse Source 
The directory-level targets missed the first level of sub-targets.
E.g. `qtbase_qmake` did not have a dependency to `qmake`.

Fix qt_build_internals_get_repo_targets to first grab all targets of the
subdirectory and then recurse.

Pick-to: 6.1 6.0
Change-Id: I3604000caec22fac9a4cc5f5aaf651d550d16793
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Joerg Bornemann 2021-04-16 16:31:25 +02:00
parent ec7ff5cede
commit 82f8519b82
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
View File

@ -243,10 +243,7 @@ endmacro()
# find all targets defined in $subdir by recursing through all added subdirectories # find all targets defined in $subdir by recursing through all added subdirectories
# populates $qt_repo_targets with a ;-list of non-UTILITY targets # populates $qt_repo_targets with a ;-list of non-UTILITY targets
macro(qt_build_internals_get_repo_targets subdir) macro(qt_build_internals_get_repo_targets subdir)
get_directory_property(_directories DIRECTORY "${subdir}" SUBDIRECTORIES) get_directory_property(_targets DIRECTORY "${subdir}" BUILDSYSTEM_TARGETS)
if (_directories)
foreach(_directory IN LISTS _directories)
get_directory_property(_targets DIRECTORY "${_directory}" BUILDSYSTEM_TARGETS)
if(_targets) if(_targets)
foreach(_target IN LISTS _targets) foreach(_target IN LISTS _targets)
get_target_property(_type ${_target} TYPE) get_target_property(_type ${_target} TYPE)
@ -255,6 +252,10 @@ macro(qt_build_internals_get_repo_targets subdir)
endif() endif()
endforeach() endforeach()
endif() endif()
get_directory_property(_directories DIRECTORY "${subdir}" SUBDIRECTORIES)
if (_directories)
foreach(_directory IN LISTS _directories)
qt_build_internals_get_repo_targets("${_directory}") qt_build_internals_get_repo_targets("${_directory}")
endforeach() endforeach()
endif() endif()