From 0cdc0ea4c2f193676b2388f8d3a39b697cd25f85 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Mon, 18 Jul 2022 20:23:59 -0400 Subject: [PATCH] CMake: include the libexecdir in generated pkg-config files In Qt6, the installed tools can be in one of two different locations, depending on whether it is considered a helper or not. This means that when migrating from Qt5 to Qt6, the pkg-config files no longer reliably described where to find tools such as moc, uic, and rcc, which third-party projects need to know about in their build systems. Add this information in, to match qmake -query and Qt6CoreConfigExtras.cmake Task-number: QTBUG-105051 Change-Id: I6692a76e0491a1c5e28982aa5fbe8b8aec8dec56 Reviewed-by: Alexandru Croitor (cherry picked from commit d8f9ac784e919064ab2620a3bd77794d6e730c9a) Reviewed-by: Qt Cherry-pick Bot --- cmake/PkgConfigLibrary.pc.in | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake/PkgConfigLibrary.pc.in b/cmake/PkgConfigLibrary.pc.in index 609346cb393..9393cec0c5c 100644 --- a/cmake/PkgConfigLibrary.pc.in +++ b/cmake/PkgConfigLibrary.pc.in @@ -1,6 +1,7 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=${prefix} bindir=${prefix}/@INSTALL_BINDIR@ +libexecdir=${prefix}/@INSTALL_LIBEXECDIR@ libdir=${prefix}/@INSTALL_LIBDIR@ includedir=${prefix}/@INSTALL_INCLUDEDIR@ $<$:mkspecsdir=${prefix}/@INSTALL_MKSPECSDIR@>