diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-07-30 13:16:10 +0200 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2021-08-27 11:01:38 +0200 |
| commit | 928ffbd1e20860fdcfbddde8e39303252a9ebb98 (patch) | |
| tree | 92ffed0cd81c0e3cec21ca0a0456666522aa7bb1 /cmake/QtPostProcessHelpers.cmake | |
| parent | abdd52451978478234c2ae4d2a002c82e9d4b5fe (diff) | |
Use correct module include name across the project
Module may have specific module include name that should be taken into
account when specifying module include directories in different places.
The INTERFACE_MODULE_INCLUDE_NAME module property name is aligned to
the common naming rules and the property is used to preform include
paths instead of the direct use of the module name.
Add additional paths generated by qt_internal_module_info to keep them
consistent across all cmake files.
Pick-to: 6.2
Change-Id: I4c94017abc322c48616f47e65e371bd863bb087d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake/QtPostProcessHelpers.cmake')
| -rw-r--r-- | cmake/QtPostProcessHelpers.cmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cmake/QtPostProcessHelpers.cmake b/cmake/QtPostProcessHelpers.cmake index 4c898c5378..32046c3948 100644 --- a/cmake/QtPostProcessHelpers.cmake +++ b/cmake/QtPostProcessHelpers.cmake @@ -1,6 +1,6 @@ -function(qt_internal_write_depends_file module) - set(outfile "${QT_BUILD_DIR}/include/${module}/${module}Depends") - set(contents "/* This file was generated by cmake with the info from ${module} target. */\n") +function(qt_internal_write_depends_file target module_include_name) + set(outfile "${QT_BUILD_DIR}/include/${module_include_name}/${module_include_name}Depends") + set(contents "/* This file was generated by cmake with the info from ${target} target. */\n") string(APPEND contents "#ifdef __cplusplus /* create empty PCH in C mode */\n") foreach (m ${ARGN}) string(APPEND contents "# include <${m}/${m}>\n") @@ -249,8 +249,8 @@ function(qt_internal_create_module_depends_file target) get_target_property(hasModuleHeaders "${target}" _qt_module_has_headers) if (${hasModuleHeaders}) - get_target_property(module_include_name "${target}" INTERFACE_MODULE_INCLUDE_NAME) - qt_internal_write_depends_file(${module_include_name} ${qtdeps}) + get_target_property(module_include_name "${target}" _qt_module_include_name) + qt_internal_write_depends_file(${target} ${module_include_name} ${qtdeps}) endif() if(third_party_deps OR main_module_tool_deps OR target_deps) |