From 97ef7752a2db871d45c8e434d15e0ccec015cd65 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Tue, 15 Mar 2022 17:02:14 +0100 Subject: 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 --- cmake/QtPkgConfigHelpers.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'cmake/QtPkgConfigHelpers.cmake') 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 "\\$]+>") list(FILTER tmpopts EXCLUDE REGEX "\\$]+>") + list(TRANSFORM tmpopts REPLACE "\\$<\\$]+>:([^,>]+)>" "\\1") list(TRANSFORM tmpopts REPLACE "\\$]+)>" "\\1") list(TRANSFORM tmpopts REPLACE ">" "$") list(TRANSFORM tmpopts REPLACE "," "$") -- cgit v1.2.3