diff options
| author | Martin Reboredo <yakoyoku@gmail.com> | 2021-11-11 14:39:53 -0300 |
|---|---|---|
| committer | Martin Reboredo <yakoyoku@gmail.com> | 2022-02-28 08:39:54 -0300 |
| commit | 5b07f14a4ff6b08887473b1b583ee2f71dec6f76 (patch) | |
| tree | c9c23b405c9b0b6f9c99f1e218b03c301b69c04d /cmake/QtBaseGlobalTargets.cmake | |
| parent | 74a4d88e9a002ec30b4bb7bbaf7776b458ae15db (diff) | |
CMake build: generate pkgconfig for public modules
After the update to the CMake based build system the ability to
generate pkgconfig files, like it was with QMake, was lost.
This patch adds pkgconfig generation again via a new internal command
named qt_internal_export_pkg_config_file.
The functionality of this command consists in checking if the target
is internal. Then gets the compile definitions. It performs a search
for dependencies that is somewhat similar to
qt_get_direct_module_dependencies, although it won't recurse down for
more deps. Each dependency is then again, checked if it's internal or
has a public interface. Later these deps get deduplicated and lastly
a pkgconfig file is filled.
The resulting pkgconfig files of many of the Qt6 packages were
validated via invocations of `pkg-config --validate` and
`pkg-config --simulate` commands and later used to build local
projects plus tests that use the pkg-config provided details at
compilation time.
Although it has some limitations, with qt_internal_add_qml_module if
it specifies non-public deps these won't be listed and with non-Qt
requirements, notably in static builds, not being appended to the
PkgConfig file.
Task-number: QTBUG-86080
Change-Id: I0690bb3ca729eec328500f227261db9b7e7628f6
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake/QtBaseGlobalTargets.cmake')
| -rw-r--r-- | cmake/QtBaseGlobalTargets.cmake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cmake/QtBaseGlobalTargets.cmake b/cmake/QtBaseGlobalTargets.cmake index 3696ddd958..0b1cc3a6f0 100644 --- a/cmake/QtBaseGlobalTargets.cmake +++ b/cmake/QtBaseGlobalTargets.cmake @@ -205,6 +205,7 @@ qt_install(FILES # They can only be used while building Qt itself. qt_copy_or_install(FILES cmake/ModuleDescription.json.in + cmake/PkgConfigLibrary.pc.in cmake/Qt3rdPartyLibraryConfig.cmake.in cmake/Qt3rdPartyLibraryHelpers.cmake cmake/QtAndroidHelpers.cmake @@ -227,6 +228,7 @@ qt_copy_or_install(FILES cmake/QtFindPackageHelpers.cmake cmake/QtFindWrapConfigExtra.cmake.in cmake/QtFindWrapHelper.cmake + cmake/QtFinishPkgConfigFile.cmake cmake/QtFinishPrlFile.cmake cmake/QtFlagHandlingHelpers.cmake cmake/QtFrameworkHelpers.cmake @@ -245,6 +247,7 @@ qt_copy_or_install(FILES cmake/QtModuleToolsDependencies.cmake.in cmake/QtModuleToolsVersionlessTargets.cmake.in cmake/QtNoLinkTargetHelpers.cmake + cmake/QtPkgConfigHelpers.cmake cmake/QtPlatformAndroid.cmake cmake/QtPlatformSupport.cmake cmake/QtPluginConfig.cmake.in |