summaryrefslogtreecommitdiffstats
path: root/cmake
diff options
context:
space:
mode:
authorAlexey Edelev <alexey.edelev@qt.io>2021-06-01 12:41:55 +0200
committerAlexey Edelev <alexey.edelev@qt.io>2021-06-01 20:21:49 +0200
commit25888b068caef2db2d34ea9edd6b9a87b18e9221 (patch)
treef8e48355c8bdea6f0b47e7983a2c61bf4424f90a /cmake
parentc2c4266c8c976ffdb53e7fa27836c3249edac878 (diff)
Do not get LINK_LIBRARY of the interface libraries
Avoid getting the LINK_LIBRARY property of the interface libraries when calling a resource object finalizer. Amends a1fd4f51ada82854f35654158a334454e760a9f7 Change-Id: I19d625a927c66994902f5c89e6c82183c94af91e Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake')
-rw-r--r--cmake/QtPublicTargetHelpers.cmake8
1 files changed, 7 insertions, 1 deletions
diff --git a/cmake/QtPublicTargetHelpers.cmake b/cmake/QtPublicTargetHelpers.cmake
index 3673b6ce24..285e84608c 100644
--- a/cmake/QtPublicTargetHelpers.cmake
+++ b/cmake/QtPublicTargetHelpers.cmake
@@ -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)