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

Use module interface name as OUTPUT_NAME

Browse Source 
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>
This commit is contained in:
Alexey Edelev 2021-07-09 12:32:11 +02:00
parent 09d1196281
commit 0ae2537ad4
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmake/QtModuleHelpers.cmake
View File

@ -268,7 +268,7 @@ function(qt_internal_add_module target)
) )
else() else()
set_target_properties(${target} PROPERTIES set_target_properties(${target} PROPERTIES
OUTPUT_NAME "${INSTALL_CMAKE_NAMESPACE}${target}${QT_LIBINFIX}" OUTPUT_NAME "${INSTALL_CMAKE_NAMESPACE}${module_interface_name}${QT_LIBINFIX}"
) )
endif() endif()
@ -775,6 +775,8 @@ endfunction()
# * foo_include_dir with the module's include directory # * 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 # 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 # 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) function(qt_internal_module_info result target)
get_target_property(module_interface_name ${target} _qt_module_interface_name) get_target_property(module_interface_name ${target} _qt_module_interface_name)
if(NOT 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}_lower" "${lower}" PARENT_SCOPE)
set("${result}_repo_include_dir" "${QT_BUILD_DIR}/include" 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}_include_dir" "${QT_BUILD_DIR}/include/${module}" PARENT_SCOPE)
set("${result}_interface_name" "${module_interface_name}" PARENT_SCOPE)
endfunction() endfunction()
# Generate a module description file based on the template in ModuleDescription.json.in # Generate a module description file based on the template in ModuleDescription.json.in