diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2022-03-15 17:02:14 +0100 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2022-03-17 16:25:00 +0100 |
| commit | 97ef7752a2db871d45c8e434d15e0ccec015cd65 (patch) | |
| tree | fdc7f5fefa12d268c147c4999728a3eec1d40fff /cmake/QtPkgConfigHelpers.cmake | |
| parent | 8adacba3e6970d784108645d5c0a70e5b9c1151e (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
Pick-to: 6.2 6.3
Fixes: QTBUG-101723
Change-Id: Ib837b3f3429d195a469450ef25af9630ad7d15e2
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake/QtPkgConfigHelpers.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>") |