diff options
| -rw-r--r-- | cmake/QtPluginHelpers.cmake | 10 | ||||
| -rw-r--r-- | src/plugins/sqldrivers/CMakeLists.txt | 3 |
2 files changed, 7 insertions, 6 deletions
diff --git a/cmake/QtPluginHelpers.cmake b/cmake/QtPluginHelpers.cmake index 497ccc0e89..b3482ee1ef 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 e11840d182..6de087839e 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() |