From b104bedea171825db06cc257179bb3e05915a159 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 28 Apr 2021 15:25:18 +0200 Subject: 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 --- cmake/QtModuleConfig.cmake.in | 2 -- 1 file changed, 2 deletions(-) (limited to 'cmake/QtModuleConfig.cmake.in') diff --git a/cmake/QtModuleConfig.cmake.in b/cmake/QtModuleConfig.cmake.in index 0573256982..ee66f566fa 100644 --- a/cmake/QtModuleConfig.cmake.in +++ b/cmake/QtModuleConfig.cmake.in @@ -91,8 +91,6 @@ if (TARGET @QT_CMAKE_EXPORT_NAMESPACE@::@target@) include("${CMAKE_CURRENT_LIST_DIR}/${extra_cmake_include}") endforeach() - include(${_qt_@PROJECT_VERSION_MAJOR@_config_cmake_dir}/QtFeature.cmake) - qt_make_features_available(@QT_CMAKE_EXPORT_NAMESPACE@::@target@) if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/@INSTALL_CMAKE_NAMESPACE@@target@Plugins.cmake") -- cgit v1.2.3