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

Remove the LINK_LANGUAGE genex condition when generating .pc file

Browse Source 
Conditions with the LINK_LANGUAGE genex are not parsed correctly when
generating .pc file. So link options will be added unconditionally.

Amends d1e02c385539ce971fbad207ba9aaa32be9c7bac

Pick-to: 6.2 6.3
Fixes: QTBUG-101723
Change-Id: Ib837b3f3429d195a469450ef25af9630ad7d15e2
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Alexey Edelev 2022-03-15 17:02:14 +01:00
parent 8adacba3e6
commit 97ef7752a2
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmake/QtPkgConfigHelpers.cmake
View File

@ -8,6 +8,7 @@ macro(qt_internal_set_pkg_config_cpp_flags var options flag)
set(tmpopts "${options}")
list(FILTER tmpopts EXCLUDE REGEX "\\$<BUILD_INTERFACE:[^,>]+>")
list(FILTER tmpopts EXCLUDE REGEX "\\$<TARGET_PROPERTY:[^,>]+>")
list(TRANSFORM tmpopts REPLACE "\\$<\\$<LINK_LANGUAGE:[^,>]+>:([^,>]+)>" "\\1")
list(TRANSFORM tmpopts REPLACE "\\$<INSTALL_INTERFACE:([^,>]+)>" "\\1")
list(TRANSFORM tmpopts REPLACE ">" "$<ANGLE-R>")
list(TRANSFORM tmpopts REPLACE "," "$<COMMA>")