diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-07-09 12:32:11 +0200 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2021-07-13 20:15:14 +0200 |
| commit | 0ae2537ad44eb427dfaaa254d9b838a2cb5a2ac5 (patch) | |
| tree | 3af4053fe3446014fd37f048d7456d7d26e57777 /cmake/QtModuleHelpers.cmake | |
| parent | 09d1196281ccd03dac55781ac91f6c4eb7bb4de9 (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.
Pick-to: 6.2
Fixes: QTBUG-95077
Change-Id: I02e4fced0fc3172e60f07bc7d1515e23744db567
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake/QtModuleHelpers.cmake')
| -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 6715c407b3..dc011a717e 100644 --- a/cmake/QtModuleHelpers.cmake +++ b/cmake/QtModuleHelpers.cmake @@ -268,7 +268,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() @@ -775,6 +775,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) @@ -790,6 +792,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 |