Skip to content

Commit

Permalink
Do not get LINK_LIBRARY of the interface libraries
Browse files Browse the repository at this point in the history
Avoid getting the LINK_LIBRARY property of the interface libraries
when calling a resource object finalizer.

Amends a1fd4f5

Change-Id: I19d625a927c66994902f5c89e6c82183c94af91e
Reviewed-by: Alexandru Croitor <[email protected]>
  • Loading branch information
semlanik committed Jun 1, 2021
1 parent c2c4266 commit 25888b0
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion cmake/QtPublicTargetHelpers.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,16 @@ endfunction()

function(__qt_internal_collect_resource_objects_recursively out_var target initial_target)
get_property(resource_processed_targets GLOBAL PROPERTY _qt_resource_processed_targets)

set(interface_libs "")
set(libs "")
if(NOT "${target}" STREQUAL "${initial_target}")
get_target_property(interface_libs ${target} INTERFACE_LINK_LIBRARIES)
endif()
get_target_property(libs ${target} LINK_LIBRARIES)
get_target_property(type ${target} TYPE)
if(NOT type STREQUAL "INTERFACE_LIBRARY")
get_target_property(libs ${target} LINK_LIBRARIES)
endif()

set(resource_targets "")
foreach(lib IN LISTS libs interface_libs)
Expand Down

0 comments on commit 25888b0

Please sign in to comment.