diff options
| author | Kai Köhne <kai.koehne@qt.io> | 2021-03-31 10:48:20 +0200 |
|---|---|---|
| committer | Kai Köhne <kai.koehne@qt.io> | 2021-03-31 10:56:39 +0200 |
| commit | 1397f8c123ab493639f8ccdd5347fb52c2adee11 (patch) | |
| tree | 1b36db9deb9b9376e95a2345c5e417c8cb237d08 /cmake | |
| parent | c746f27e17d255e197e68b6d65c509865d3b9108 (diff) | |
Fix ignored submodules if a submodule does not have a dependency.yaml
If a subdirectory has a CMakeLists.txt file, but no dependency.yaml file
qt_internal_add_module_dependencies will bail out early, with
out_module_dependencies being empty.
Pick-to: 6.1
Fixes: QTBUG-92257
Change-Id: I024e812e9debd3c83b24bf306ff0375b2cb08659
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtTopLevelHelpers.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmake/QtTopLevelHelpers.cmake b/cmake/QtTopLevelHelpers.cmake index 8643b850..2d06a8fd 100644 --- a/cmake/QtTopLevelHelpers.cmake +++ b/cmake/QtTopLevelHelpers.cmake @@ -124,8 +124,9 @@ function(qt_internal_sort_module_dependencies modules out_all_ordered dependenci "${${module_dependencies_list_var_name}}" PARENT_SCOPE) if(NOT module_depends) list(APPEND no_dependencies "${module}") + else() + set(ordered "${out_ordered}") endif() - set(ordered "${out_ordered}") endforeach() if (no_dependencies) list(APPEND ordered "${no_dependencies}") |