|author||Alexandru Croitor <email@example.com>||2021-04-28 15:25:18 +0200|
|committer||Alexandru Croitor <firstname.lastname@example.org>||2021-05-11 18:57:17 +0200|
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 <email@example.com>
Diffstat (limited to 'cmake/QtBuild.cmake')
1 files changed, 5 insertions, 0 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake
index 18027848c2..20efee0d6e 100644
@@ -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.
@@ -544,6 +545,10 @@ if(ANDROID)
+# Helpers that are available in public projects and while building Qt itself.
# 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.