1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmake: Allow module to specify initial depends

Browse Source 
Change-Id: I85f39f16f2103dcb42ff467bbc79a0baf6c020e1
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Tor Arne Vestbø 2020-11-03 16:10:33 +01:00
parent d281f5cc35
commit 8186f18c4a
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmake/QtPriHelpers.cmake
View File

@ -152,9 +152,11 @@ function(qt_generate_module_pri_file target)
"${property_prefix}QT_MODULE_PRI_EXTRA_CONTENT") "${property_prefix}QT_MODULE_PRI_EXTRA_CONTENT")
get_target_property(module_ldflags "${target}" get_target_property(module_ldflags "${target}"
"${property_prefix}QT_MODULE_LDFLAGS") "${property_prefix}QT_MODULE_LDFLAGS")
get_target_property(module_depends "${target}"
"${property_prefix}QT_MODULE_DEPENDS")
foreach(var enabled_features disabled_features enabled_private_features disabled_private_features foreach(var enabled_features disabled_features enabled_private_features disabled_private_features
module_internal_config module_uses module_pri_extra_content module_ldflags) module_internal_config module_uses module_pri_extra_content module_ldflags module_depends)
if(${var} STREQUAL "${var}-NOTFOUND") if(${var} STREQUAL "${var}-NOTFOUND")
set(${var} "") set(${var} "")
else() else()
@ -240,6 +242,7 @@ function(qt_generate_module_pri_file target)
qt_get_direct_module_dependencies(${target} public_module_dependencies) qt_get_direct_module_dependencies(${target} public_module_dependencies)
list(JOIN public_module_dependencies " " public_module_dependencies) list(JOIN public_module_dependencies " " public_module_dependencies)
set(public_module_dependencies "${module_depends} ${public_module_dependencies}")
qt_path_join(pri_file_name "${target_path}" "qt_lib_${config_module_name}.pri") qt_path_join(pri_file_name "${target_path}" "qt_lib_${config_module_name}.pri")
list(APPEND pri_files "${pri_file_name}") list(APPEND pri_files "${pri_file_name}")