From 8186f18c4a815a2ec6ca534a01b5549a62e7fdb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Tue, 3 Nov 2020 16:10:33 +0100 Subject: [PATCH] cmake: Allow module to specify initial depends Change-Id: I85f39f16f2103dcb42ff467bbc79a0baf6c020e1 Reviewed-by: Alexandru Croitor --- cmake/QtPriHelpers.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake index 5fc0a5877b3..b4c35cef7c1 100644 --- a/cmake/QtPriHelpers.cmake +++ b/cmake/QtPriHelpers.cmake @@ -152,9 +152,11 @@ function(qt_generate_module_pri_file target) "${property_prefix}QT_MODULE_PRI_EXTRA_CONTENT") get_target_property(module_ldflags "${target}" "${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 - 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") set(${var} "") else() @@ -240,6 +242,7 @@ function(qt_generate_module_pri_file target) qt_get_direct_module_dependencies(${target} 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") list(APPEND pri_files "${pri_file_name}")