diff options
| author | Kai Köhne <kai.koehne@qt.io> | 2021-03-31 10:48:20 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-03-31 09:39:29 +0000 |
| commit | 6a85c577bbfcd7b471d45d0e0cee612a9af4b153 (patch) | |
| tree | 5db242da2c05e4b53fc1671bfab987c33e32c907 | |
| parent | ea508a87a8c25b549d31bbd2469a117ffb4000fa (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.
Fixes: QTBUG-92257
Change-Id: I024e812e9debd3c83b24bf306ff0375b2cb08659
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 1397f8c123ab493639f8ccdd5347fb52c2adee11)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -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 6287d935..fc230ecf 100644 --- a/cmake/QtTopLevelHelpers.cmake +++ b/cmake/QtTopLevelHelpers.cmake @@ -108,8 +108,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}") |