diff options
| author | Eli Schwartz <eschwartz93@gmail.com> | 2022-07-18 20:23:59 -0400 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-07-26 14:18:10 +0000 |
| commit | c7a731d9875dfbca8128deb8ae746618f83d111a (patch) | |
| tree | 3fd70aed7acc58a08155ab61b4f03e806033ba77 | |
| parent | 64b08f4fa1ae18371f39da40a3add7d81cbafb16 (diff) | |
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 <alexandru.croitor@qt.io>
(cherry picked from commit d8f9ac784e919064ab2620a3bd77794d6e730c9a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | cmake/PkgConfigLibrary.pc.in | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cmake/PkgConfigLibrary.pc.in b/cmake/PkgConfigLibrary.pc.in index 609346cb39..9393cec0c5 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@ $<$<BOOL:@contains_mkspecs@>:mkspecsdir=${prefix}/@INSTALL_MKSPECSDIR@> |