AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not get LINK_LIBRARY of the interface libraries

Browse Source 
Avoid getting the LINK_LIBRARY property of the interface libraries
when calling a resource object finalizer.

Amends a1fd4f51ad

Change-Id: I19d625a927c66994902f5c89e6c82183c94af91e
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Alexey Edelev 2021-06-01 12:41:55 +02:00
parent c2c4266c8c
commit 25888b068c
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/QtPublicTargetHelpers.cmake
View File

@ -47,10 +47,16 @@ endfunction()
function(__qt_internal_collect_resource_objects_recursively out_var target initial_target) function(__qt_internal_collect_resource_objects_recursively out_var target initial_target)
get_property(resource_processed_targets GLOBAL PROPERTY _qt_resource_processed_targets) get_property(resource_processed_targets GLOBAL PROPERTY _qt_resource_processed_targets)
set(interface_libs "")
set(libs "")
if(NOT "${target}" STREQUAL "${initial_target}") if(NOT "${target}" STREQUAL "${initial_target}")
get_target_property(interface_libs ${target} INTERFACE_LINK_LIBRARIES) get_target_property(interface_libs ${target} INTERFACE_LINK_LIBRARIES)
endif() endif()
get_target_property(type ${target} TYPE)
if(NOT type STREQUAL "INTERFACE_LIBRARY")
get_target_property(libs ${target} LINK_LIBRARIES) get_target_property(libs ${target} LINK_LIBRARIES)
endif()
set(resource_targets "") set(resource_targets "")
foreach(lib IN LISTS libs interface_libs) foreach(lib IN LISTS libs interface_libs)