From a36a738a931eb9e204e33d71951642131cf40b82 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Thu, 8 Apr 2021 15:55:09 +0200 Subject: [PATCH] Skip adding externally added plugins to the plugin meta-sets Plugin meta-sets are not visible outside of the module build tree, so there is no point in adding dependencies for externally added plugins. Change-Id: Ica5b29b57c032f4fc9b128172aaa806392e9e581 Reviewed-by: Alexandru Croitor (cherry picked from commit bbe26a766748c00da5e2241a9c7ec5e714dd76ad) --- cmake/QtPluginHelpers.cmake | 10 +++++++--- src/plugins/sqldrivers/CMakeLists.txt | 3 --- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/cmake/QtPluginHelpers.cmake b/cmake/QtPluginHelpers.cmake index 497ccc0e89e..b3482ee1ef9 100644 --- a/cmake/QtPluginHelpers.cmake +++ b/cmake/QtPluginHelpers.cmake @@ -150,11 +150,15 @@ function(qt_internal_add_plugin target) endif() endif() - add_dependencies(qt_plugins "${target}") + if(TARGET qt_plugins) + add_dependencies(qt_plugins "${target}") + endif() if(arg_TYPE STREQUAL "platforms") - add_dependencies(qpa_plugins "${target}") + if(TARGET qpa_plugins) + add_dependencies(qpa_plugins "${target}") + endif() - if(_default_plugin) + if(_default_plugin AND TARGET qpa_default_plugins) add_dependencies(qpa_default_plugins "${target}") endif() endif() diff --git a/src/plugins/sqldrivers/CMakeLists.txt b/src/plugins/sqldrivers/CMakeLists.txt index e11840d1822..6de087839e8 100644 --- a/src/plugins/sqldrivers/CMakeLists.txt +++ b/src/plugins/sqldrivers/CMakeLists.txt @@ -16,9 +16,6 @@ if (NOT CMAKE_PROJECT_NAME STREQUAL "QtBase" AND NOT CMAKE_PROJECT_NAME STREQUAL Sql ) qt_prepare_standalone_project() - - # needed by qt_internal_add_plugin - add_custom_target(qt_plugins) else() qt_internal_upgrade_cmake_policies() endif()