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

CMake: Check module dependency before configure

Browse Source 
Move all modules dependency check before actual configuration of
any module.

Change-Id: I40838ab59de1be1cd8ca3a006e195455f2692982
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Alexey Edelev
2020-11-16 12:35:31 +01:00
committed by Alexey Edelev
parent b34fa5f9cf
commit c7c8d1e064
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@@ -47,10 +47,9 @@ qt_internal_sort_module_dependencies("${BUILD_SUBMODULES}" BUILD_SUBMODULES
"${qt_module_dependency_map_prefix}")
foreach(module IN LISTS BUILD_SUBMODULES)
message(NOTICE "Configuring '${module}'")
# Check for unmet dependencies
if(NOT DEFINED BUILD_${module} OR BUILD_${module})
message(NOTICE "Check dependencies of '${module}'")
foreach(dep IN LISTS "${qt_module_dependency_map_prefix}${module}")
if (dep STREQUAL "qtbase")
# Always available skip
@@ -67,7 +66,10 @@ foreach(module IN LISTS BUILD_SUBMODULES)
endif()
endforeach()
endif()
endforeach()
foreach(module IN LISTS BUILD_SUBMODULES)
message(NOTICE "Configuring '${module}'")
ecm_optional_add_subdirectory("${module}")
if(module STREQUAL "qtbase")