diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-06-18 10:03:02 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-06-18 21:10:36 +0000 |
| commit | 2a89b6848c54a18878b010c88c9efbbea343f34f (patch) | |
| tree | 1e587e4c57d152d59354795df142bdd1f980871c /cmake | |
| parent | f3d54555a9b8d1cb298801e3ac88b5acb70e4650 (diff) | |
Use target OUTPUT_NAME as a module identifier in .pri files
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
Fixes: QTBUG-94568
Change-Id: I8d9c04273e4cdb1a2e6a3b0db3ddf52e008c0cf7
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 29789ff0eabc2ea91a21526c475e5a8c0126a7af)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtPriHelpers.cmake | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake index 599ccb8c4d..cfb5e85dc6 100644 --- a/cmake/QtPriHelpers.cmake +++ b/cmake/QtPriHelpers.cmake @@ -221,18 +221,16 @@ function(qt_generate_module_pri_file target) set(public_module_frameworks "${framework_base_path}") set(private_module_includes "${framework_base_path}/${fw_private_header_dir} \ ${framework_base_path}/${fw_private_module_header_dir}") - set(module_name_in_pri "${module}") else() set(public_module_includes "$$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/${module}") set(public_module_frameworks "") 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() if(arg_HEADER_MODULE) set(module_name_in_pri "") else() - set(module_name_in_pri "${module_name_in_pri}${QT_LIBINFIX}") + get_target_property(module_name_in_pri ${target} OUTPUT_NAME) endif() get_target_property(hasModuleHeaders ${target} INTERFACE_MODULE_HAS_HEADERS) |