From 337cadbcb7900d78505b25e66555b853d2c2c707 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Fri, 5 Apr 2024 11:01:24 +0200 Subject: Consider '^Qt6' deps when generating pkg-config files Dependencies that alredy start with QT_CMAKE_EXPORT_NAMESPACE shouldn't be skipped but collected as is when generating pkg-config files. Pick-to: 6.5 6.6 6.7 Fixes: QTBUG-124135 Change-Id: I6875337c2e1d98f657e52a5fc2c37eebccf08b98 Reviewed-by: Alexandru Croitor Reviewed-by: Qt CI Bot --- cmake/QtPkgConfigHelpers.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/QtPkgConfigHelpers.cmake b/cmake/QtPkgConfigHelpers.cmake index dbe736c438..ea28516941 100644 --- a/cmake/QtPkgConfigHelpers.cmake +++ b/cmake/QtPkgConfigHelpers.cmake @@ -74,7 +74,7 @@ function(qt_internal_generate_pkg_config_file module) foreach(dep IN LISTS loose_target_requires) if(dep MATCHES "^Qt::") string(REGEX REPLACE "Qt" "${QT_CMAKE_EXPORT_NAMESPACE}" dep ${dep}) - else() + elseif(NOT dep MATCHES "^${QT_CMAKE_EXPORT_NAMESPACE}::") # TODO: Figure out a way to get non-Qt requirements PkgConfig files. continue() endif() -- cgit v1.2.3