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

CMake: Fix resource_name variable name in __qt_propagate_generated_resource

Browse Source 
__qt_propagate_generated_resource used resourceName variable from
parent scope instead of one passed to function.

Change-Id: I18ce8a9f9c01bcfdbab532def55af4e2780d7753
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit eaedd7efbf5f97be585437ad2d358c43c155204f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Alexey Edelev 2020-11-20 12:49:53 +01:00 committed by Qt Cherry-pick Bot
parent 4cb21ded95
commit 72c31006a9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/Qt6CoreMacros.cmake
View File

@ -1059,9 +1059,9 @@ endfunction()
function(__qt_propagate_generated_resource target resource_name generated_source_code output_generated_target) function(__qt_propagate_generated_resource target resource_name generated_source_code output_generated_target)
get_target_property(type ${target} TYPE) get_target_property(type ${target} TYPE)
if(type STREQUAL STATIC_LIBRARY) if(type STREQUAL STATIC_LIBRARY)
set(resource_target "${target}_resources_${resourceName}") set(resource_target "${target}_resources_${resource_name}")
add_library("${resource_target}" OBJECT "${generated_source_code}") add_library("${resource_target}" OBJECT "${generated_source_code}")
set_property(TARGET ${resource_target} APPEND PROPERTY _qt_resource_name ${resourceName}) set_property(TARGET ${resource_target} APPEND PROPERTY _qt_resource_name ${resource_name})
# Use TARGET_NAME genex to map to the correct prefixed target name when it is exported # Use TARGET_NAME genex to map to the correct prefixed target name when it is exported
# via qt_install(EXPORT), so that the consumers of the target can find the object library # via qt_install(EXPORT), so that the consumers of the target can find the object library