diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-04-28 15:25:18 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-05-11 18:57:17 +0200 |
| commit | b104bedea171825db06cc257179bb3e05915a159 (patch) | |
| tree | 55e601dcef355da3cc1cb1247d6b7bea7dea2cd7 /cmake/QtBuild.cmake | |
| parent | 867c0b8d8a53974074b1fff5b132f3ae9f150066 (diff) | |
CMake: Refactor handling of static plugins
Extract common static plugin handling functionality into a separate
QtPublicPluginHelpers.cmake file which is loaded by the Qt6 package.
Split the code into smaller functions that will be re-used by each
templated QtPlugins.cmake.in file, rather than copy pasting the same
code into each QtFooPlugins.cmake file.
As a drive-by, handle QtFeatures.cmake and QtFeaturesCommon.cmake
as public helper files just like QtPublicPluginHelpers.cmake.
This makes it clearer that the functions are available outside
the internal Qt build and also provides a way for not dumping new
helper functions into Qt6CoreMacros.cmake.
Task-number: QTBUG-92933
Change-Id: Id816ef009b4fac1cd317d3ef23f21b3530028067
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'cmake/QtBuild.cmake')
| -rw-r--r-- | cmake/QtBuild.cmake | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index 18027848c2..20efee0d6e 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -507,6 +507,7 @@ set(__qt_internal_add_executable_multi_args option(QT_CMAKE_DEBUG_EXTEND_TARGET "Debug extend_target calls in Qt's build system" OFF) +# Internal helpers available only while building Qt itself. include(Qt3rdPartyLibraryHelpers) include(QtAppHelpers) include(QtAutogenHelpers) @@ -544,6 +545,10 @@ if(ANDROID) include(QtAndroidHelpers) endif() +# Helpers that are available in public projects and while building Qt itself. +include(QtPublicPluginHelpers) + + # TODO: This block provides support for old variables. It should be removed once # we remove all references to these variables in other Qt module repos. # Prefer to use the provided commands to retrieve the relevant things instead. |