diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2022-03-15 17:02:14 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-04-12 13:58:12 +0200 |
| commit | ac27a0d6b45b10580c9721c757f87e63a5f35861 (patch) | |
| tree | 2cadf352dd2aaf2d211964a9b745fd0d9ef609ee /cmake | |
| parent | 94110b4be2ea4df1699422ac73d97fd3202f889d (diff) | |
Remove the LINK_LANGUAGE genex condition when generating .pc file
Conditions with the LINK_LANGUAGE genex are not parsed correctly when
generating .pc file. So link options will be added unconditionally.
Amends d1e02c385539ce971fbad207ba9aaa32be9c7bac
Fixes: QTBUG-101723
Change-Id: Ib837b3f3429d195a469450ef25af9630ad7d15e2
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 97ef7752a2db871d45c8e434d15e0ccec015cd65)
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtPkgConfigHelpers.cmake | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cmake/QtPkgConfigHelpers.cmake b/cmake/QtPkgConfigHelpers.cmake index d88be5fe78..45bbcbedf0 100644 --- a/cmake/QtPkgConfigHelpers.cmake +++ b/cmake/QtPkgConfigHelpers.cmake @@ -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>") |