Revert "CMake: Fix rpath-link dependencies when cross-compiling"
This reverts commit 87215c70c0ff0bdc52dfa463f050d2aa049cdd91. Reason for revert: Breaks configuration of standalone tests in leaf modules Pick-to: 6.2 Fixes: QTBUG-97673 Task-number: QTBUG-86533 Change-Id: Idd5014b57a8d10070108f5b235c822863dbac088 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
This commit is contained in:
parent
d42cfeb84f
commit
8d1db12bba
@ -308,18 +308,10 @@ function(qt_register_target_dependencies target public_libs private_libs)
|
||||
set(target_deps "")
|
||||
endif()
|
||||
|
||||
# Only process private dependencies if target is a static library
|
||||
get_target_property(target_type ${target} TYPE)
|
||||
set(lib_list ${public_libs})
|
||||
# Record Qt target private dependencies information which will be used to generate
|
||||
# find_dependency() calls.
|
||||
#
|
||||
# Private static library dependencies become $<LINK_ONLY:> dependencies in
|
||||
# INTERFACE_LINK_LIBRARIES.
|
||||
#
|
||||
# Private shared library dependencies are listed in the target's
|
||||
# IMPORTED_LINK_DEPENDENT_LIBRARIES and used in rpath-link calculation.
|
||||
# See QTBUG-86533 for some details.
|
||||
if (target_type STREQUAL "STATIC_LIBRARY" OR target_type STREQUAL "SHARED_LIBRARY")
|
||||
if (target_type STREQUAL "STATIC_LIBRARY")
|
||||
list(APPEND lib_list ${private_libs})
|
||||
endif()
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user