diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-04-16 16:31:25 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-04-19 08:15:52 +0200 |
| commit | 82f8519b827ba7fd89f8168632461f47b09605a7 (patch) | |
| tree | 6f2766f4570a6a5e7f9153f1454107095f738564 /cmake | |
| parent | ec7ff5cede92412b929ff30207b0eeafce93ee3b (diff) | |
Fix top-level build repository targets
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>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtBuildInternals/QtBuildInternalsConfig.cmake | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake index 1953454b23..18fb737eda 100644 --- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake +++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake @@ -243,18 +243,19 @@ endmacro() # find all targets defined in $subdir by recursing through all added subdirectories # populates $qt_repo_targets with a ;-list of non-UTILITY targets macro(qt_build_internals_get_repo_targets subdir) + get_directory_property(_targets DIRECTORY "${subdir}" BUILDSYSTEM_TARGETS) + if(_targets) + foreach(_target IN LISTS _targets) + get_target_property(_type ${_target} TYPE) + if(NOT (${_type} STREQUAL "UTILITY" OR ${_type} STREQUAL "INTERFACE")) + list(APPEND qt_repo_targets "${_target}") + endif() + endforeach() + endif() + get_directory_property(_directories DIRECTORY "${subdir}" SUBDIRECTORIES) if (_directories) foreach(_directory IN LISTS _directories) - get_directory_property(_targets DIRECTORY "${_directory}" BUILDSYSTEM_TARGETS) - if (_targets) - foreach(_target IN LISTS _targets) - get_target_property(_type ${_target} TYPE) - if (NOT (${_type} STREQUAL "UTILITY" OR ${_type} STREQUAL "INTERFACE")) - list(APPEND qt_repo_targets "${_target}") - endif() - endforeach() - endif() qt_build_internals_get_repo_targets("${_directory}") endforeach() endif() |