diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-01-07 17:26:55 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-01-20 15:25:08 +0100 |
| commit | 7e7dacc109273fca9a72a1069d6228ea5e980d37 (patch) | |
| tree | ca7cc2345d2a957b2dad549ed90bd99044583656 | |
| parent | d0071a4f871fa9c5406790cf17c5516b79ece1d7 (diff) | |
Do not export the QT_PLUGINS target property of Qt modules
This property is dynamically determined and set in the
Qt6${module-name}PluginsConfig.cmake files now.
There is no need anymore to export this property.
Change-Id: I2d164864c4099034b88f9ad852eae8b9f9e55f8b
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
| -rw-r--r-- | cmake/QtFeature.cmake | 2 | ||||
| -rw-r--r-- | cmake/QtPlugins.cmake.in | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/cmake/QtFeature.cmake b/cmake/QtFeature.cmake index b0f6352449..f38d464221 100644 --- a/cmake/QtFeature.cmake +++ b/cmake/QtFeature.cmake @@ -617,7 +617,7 @@ function(qt_feature_module_end) set(propertyPrefix "INTERFACE_") else() set(propertyPrefix "") - set_property(TARGET "${target}" APPEND PROPERTY EXPORT_PROPERTIES "QT_ENABLED_PUBLIC_FEATURES;QT_DISABLED_PUBLIC_FEATURES;QT_ENABLED_PRIVATE_FEATURES;QT_DISABLED_PRIVATE_FEATURES;MODULE_PLUGIN_TYPES;QT_PLUGINS;QT_QMAKE_PUBLIC_CONFIG;QT_QMAKE_PRIVATE_CONFIG;QT_QMAKE_PUBLIC_QT_CONFIG") + set_property(TARGET "${target}" APPEND PROPERTY EXPORT_PROPERTIES "QT_ENABLED_PUBLIC_FEATURES;QT_DISABLED_PUBLIC_FEATURES;QT_ENABLED_PRIVATE_FEATURES;QT_DISABLED_PRIVATE_FEATURES;MODULE_PLUGIN_TYPES;QT_QMAKE_PUBLIC_CONFIG;QT_QMAKE_PRIVATE_CONFIG;QT_QMAKE_PUBLIC_QT_CONFIG") endif() foreach(visibility public private) string(TOUPPER "${visibility}" capitalVisibility) diff --git a/cmake/QtPlugins.cmake.in b/cmake/QtPlugins.cmake.in index b5ecd6ba87..54bfc41251 100644 --- a/cmake/QtPlugins.cmake.in +++ b/cmake/QtPlugins.cmake.in @@ -3,7 +3,7 @@ include_guard(DIRECTORY) if(NOT @BUILD_SHARED_LIBS@) set(_module_target "@INSTALL_CMAKE_NAMESPACE@::@QT_MODULE@") - get_target_property(_qt_plugins ${_module_target} QT_PLUGINS) + set(_qt_plugins "") # Include all PluginConfig.cmake files and update the QT_PLUGINS property of the module. file(GLOB _qt_plugin_config_files "${CMAKE_CURRENT_LIST_DIR}/@INSTALL_CMAKE_NAMESPACE@*PluginConfig.cmake") @@ -12,7 +12,6 @@ if(NOT @BUILD_SHARED_LIBS@) include("${_config_file}") list(APPEND _qt_plugins ${_qt_plugin}) endforeach() - list(REMOVE_DUPLICATES _qt_plugins) set_property(TARGET ${_module_target} PROPERTY QT_PLUGINS ${_qt_plugins}) # Properties can't be set on aliased targets, so make sure to unalias the target. This is needed |