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

Fix build with CMake 3.16

Browse Source 
Do not read the target property LINK_LIBRARIES from interface libraries
as this leads to errors with CMake 3.16.

This amends commit 326b91ea788b013512ae911c51cc19497d88916d.

Pick-to: 6.2
Change-Id: I44251c7633d5ecd977cd05746ac311dd1285d1e3
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Joerg Bornemann 2021-10-12 10:55:56 +02:00
parent d24651d548
commit 0098e0ca86
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/QtPriHelpers.cmake
View File

@ -99,10 +99,15 @@ endfunction()
function(qt_get_direct_module_dependencies target out_var) function(qt_get_direct_module_dependencies target out_var)
cmake_parse_arguments(arg "PRIVATE" "" "" ${ARGN}) cmake_parse_arguments(arg "PRIVATE" "" "" ${ARGN})
set(dependencies "") set(dependencies "")
get_target_property(target_type ${target} TYPE)
if(arg_PRIVATE) if(arg_PRIVATE)
if(target_type STREQUAL "INTERFACE_LIBRARY")
set(libs)
else()
get_target_property(libs ${target} LINK_LIBRARIES) get_target_property(libs ${target} LINK_LIBRARIES)
get_target_property(public_libs ${target} INTERFACE_LINK_LIBRARIES)
list(REMOVE_DUPLICATES libs) list(REMOVE_DUPLICATES libs)
endif()
get_target_property(public_libs ${target} INTERFACE_LINK_LIBRARIES)
list(REMOVE_DUPLICATES public_libs) list(REMOVE_DUPLICATES public_libs)
# Remove all Qt::Foo and Qt6::Foo from libs that also appear in public_libs. # Remove all Qt::Foo and Qt6::Foo from libs that also appear in public_libs.
@ -124,7 +129,6 @@ function(qt_get_direct_module_dependencies target out_var)
if(NOT libs) if(NOT libs)
set(libs "") set(libs "")
endif() endif()
get_target_property(target_type ${target} TYPE)
while(libs) while(libs)
list(POP_FRONT libs lib) list(POP_FRONT libs lib)
string(GENEX_STRIP "${lib}" lib) string(GENEX_STRIP "${lib}" lib)