lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 19:36:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix ignored submodules if a submodule does not have a dependency.yaml

Browse Source 
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 1397f8c123)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Kai Köhne
2021-03-31 10:48:20 +02:00
committed by Qt Cherry-pick Bot
parent ea508a87a8
commit 6a85c577bb
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/QtTopLevelHelpers.cmake
View File

@@ -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}")