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

Use target OUTPUT_NAME as a module identifier in .pri files

Browse Source 
QtPriHelpers copies the logic related to the module OUTPUT_NAME to
produce a module identifier. Since the module identifier should be
equal to OUTPUT_NAME it makes sense to reuse the property and
deduplicate logic.

Amends 8aee7c6b29be5a0ee7d5e7cfcb5f2db762b2e28b

Pick-to: 6.2
Fixes: QTBUG-94568
Change-Id: I8d9c04273e4cdb1a2e6a3b0db3ddf52e008c0cf7
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Alexey Edelev 2021-06-18 10:03:02 +02:00
parent f29ff5dffb
commit 29789ff0ea
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/QtPriHelpers.cmake
View File

@ -221,18 +221,16 @@ function(qt_generate_module_pri_file target)
set(public_module_frameworks "${framework_base_path}") set(public_module_frameworks "${framework_base_path}")
set(private_module_includes "${framework_base_path}/${fw_private_header_dir} \ set(private_module_includes "${framework_base_path}/${fw_private_header_dir} \
${framework_base_path}/${fw_private_module_header_dir}") ${framework_base_path}/${fw_private_module_header_dir}")
set(module_name_in_pri "${module}")
else() else()
set(public_module_includes "$$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/${module}") set(public_module_includes "$$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/${module}")
set(public_module_frameworks "") set(public_module_frameworks "")
set(private_module_includes "$$QT_MODULE_INCLUDE_BASE/${module}/${PROJECT_VERSION} $$QT_MODULE_INCLUDE_BASE/${module}/${PROJECT_VERSION}/${module}") set(private_module_includes "$$QT_MODULE_INCLUDE_BASE/${module}/${PROJECT_VERSION} $$QT_MODULE_INCLUDE_BASE/${module}/${PROJECT_VERSION}/${module}")
set(module_name_in_pri "${module_versioned}")
endif() endif()
if(arg_HEADER_MODULE) if(arg_HEADER_MODULE)
set(module_name_in_pri "") set(module_name_in_pri "")
else() else()
set(module_name_in_pri "${module_name_in_pri}${QT_LIBINFIX}") get_target_property(module_name_in_pri ${target} OUTPUT_NAME)
endif() endif()
get_target_property(hasModuleHeaders ${target} INTERFACE_MODULE_HAS_HEADERS) get_target_property(hasModuleHeaders ${target} INTERFACE_MODULE_HAS_HEADERS)