From bde2716f43e09bb575a11be17950226a19afe09e Mon Sep 17 00:00:00 2001 From: Craig Scott Date: Wed, 31 Mar 2021 13:56:51 +1100 Subject: Avoid using prohibited target property names with INTERFACE targets CMake 3.19 removed the restrictions on allowable names for properties on INTERFACE targets. With earlier CMake versions (back to CMake 3.11), names for custom properties must begin with either a lowercase letter or an underscore. In 5807e1ae81 (Add plugins to Qt tools and executables for static builds, 2021-03-19), the names QT_REPO_PLUGIN_CLASS_NAMES and QT_REPO_PLUGINS were used, but in some cases, the targets on which they were being set are INTERFACE targets. Replace these with names that are supported with CMake 3.11 or later. Amends 5807e1ae8168a5702ad0f6890d2b35223cfebdee Task-number: QTBUG-91915 Change-Id: Ife702a1fb339b190d46a8dafb380253219199ba6 Reviewed-by: Alexandru Croitor (cherry picked from commit 256dea0df74dc05ded438b33b6be8735048fd402) Reviewed-by: Qt Cherry-pick Bot --- cmake/QtPluginHelpers.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'cmake/QtPluginHelpers.cmake') diff --git a/cmake/QtPluginHelpers.cmake b/cmake/QtPluginHelpers.cmake index 1eb800cb0b..36c1335f6c 100644 --- a/cmake/QtPluginHelpers.cmake +++ b/cmake/QtPluginHelpers.cmake @@ -169,8 +169,8 @@ function(qt_internal_add_plugin target) DEFINITION PROJECT_NAME ) if(module_project_name STREQUAL PROJECT_NAME) - set_property(TARGET ${qt_module_target} APPEND PROPERTY QT_REPO_PLUGINS "${target}") - set_property(TARGET ${qt_module_target} APPEND PROPERTY QT_REPO_PLUGIN_CLASS_NAMES + set_property(TARGET ${qt_module_target} APPEND PROPERTY _qt_repo_plugins "${target}") + set_property(TARGET ${qt_module_target} APPEND PROPERTY _qt_repo_plugin_class_names "$" ) endif() @@ -178,7 +178,7 @@ function(qt_internal_add_plugin target) # TODO: If a repo A provides an internal executable E and a plugin P, with the plugin # type belonging to a Qt module defined in a different repo, and executable E needs to # link to plugin P in a static build, currently that won't happen. The executable E - # will link to plugins mentioned in the Qt module's QT_REPO_PLUGINS property, but that + # will link to plugins mentioned in the Qt module's _qt_repo_plugins property, but that # property will not list P because the Qt module will be an imported target and won't # have a SOURCE_DIR or PROJECT NAME, so the checks above will not be met. # Figure out how to handle such a scenario. -- cgit v1.2.3