diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-07-09 12:32:11 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-07-13 20:03:42 +0000 |
| commit | 513302e4a54aa70735b5dd728db40f67b6b8116c (patch) | |
| tree | 5644c52040487dbd5cc78d31ffabc50cfbef1c1b | |
| parent | 045804c45d886af6b8d9ffba50608384c5a10d20 (diff) | |
Use module interface name as OUTPUT_NAME
For internal modules we should keep the name of the file in file system
consistent with previous Qt versions.
Fixes: QTBUG-95077
Change-Id: I02e4fced0fc3172e60f07bc7d1515e23744db567
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 0ae2537ad44eb427dfaaa254d9b838a2cb5a2ac5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | cmake/QtModuleHelpers.cmake | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cmake/QtModuleHelpers.cmake b/cmake/QtModuleHelpers.cmake index d6e89cb2f2..090e1343b0 100644 --- a/cmake/QtModuleHelpers.cmake +++ b/cmake/QtModuleHelpers.cmake @@ -250,7 +250,7 @@ function(qt_internal_add_module target) ) else() set_target_properties(${target} PROPERTIES - OUTPUT_NAME "${INSTALL_CMAKE_NAMESPACE}${target}${QT_LIBINFIX}" + OUTPUT_NAME "${INSTALL_CMAKE_NAMESPACE}${module_interface_name}${QT_LIBINFIX}" ) endif() @@ -763,6 +763,8 @@ endfunction() # * foo_include_dir with the module's include directory # e.g for QtQuick it would be qtdeclarative_build_dir/include/QtQuick for a prefix build or # qtbase_build_dir/include/QtQuick for a non-prefix build +# * foo_interface_name the interface name of the module stored in _qt_module_interface_name +# property. function(qt_internal_module_info result target) get_target_property(module_interface_name ${target} _qt_module_interface_name) if(NOT module_interface_name) @@ -778,6 +780,7 @@ function(qt_internal_module_info result target) set("${result}_lower" "${lower}" PARENT_SCOPE) set("${result}_repo_include_dir" "${QT_BUILD_DIR}/include" PARENT_SCOPE) set("${result}_include_dir" "${QT_BUILD_DIR}/include/${module}" PARENT_SCOPE) + set("${result}_interface_name" "${module_interface_name}" PARENT_SCOPE) endfunction() # Generate a module description file based on the template in ModuleDescription.json.in |