From 88f8d5c5e090663c03f3cb7e7e6b9d28dc5d5c3e Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 4 Sep 2024 12:57:43 +0200 Subject: [PATCH] Build: Only state direct dependencies in plugin spec There is no need to state dependencies in the plugin meta data recursively, they are resolved recursively in the end anyway. This reduces the effort that we do in CMake during configure time. Change-Id: Ic3161a405f6c13ba09cfc3211f03c4b4426afbc8 Reviewed-by: Marcus Tillmanns --- cmake/QtCreatorAPI.cmake | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/cmake/QtCreatorAPI.cmake b/cmake/QtCreatorAPI.cmake index 905918f0825..1ba02655d4a 100644 --- a/cmake/QtCreatorAPI.cmake +++ b/cmake/QtCreatorAPI.cmake @@ -392,12 +392,10 @@ function(add_qtc_plugin target_name) find_dependent_plugins(_DEP_PLUGINS ${_arg_PLUGIN_DEPENDS}) set(_arg_DEPENDENCY_STRING "\"Dependencies\" : [\n") - foreach(i IN LISTS _DEP_PLUGINS) + foreach(i IN LISTS _arg_PLUGIN_DEPENDS) + get_property(_v TARGET "${i}" PROPERTY QTC_PLUGIN_VERSION) if (i MATCHES "^QtCreator::") - set(_v ${IDE_VERSION}) string(REPLACE "QtCreator::" "" i ${i}) - else() - get_property(_v TARGET "${i}" PROPERTY QTC_PLUGIN_VERSION) endif() string(TOLOWER ${i} i) string(APPEND _arg_DEPENDENCY_STRING @@ -405,11 +403,9 @@ function(add_qtc_plugin target_name) ) endforeach(i) foreach(i IN LISTS _arg_PLUGIN_RECOMMENDS) + get_property(_v TARGET "${i}" PROPERTY QTC_PLUGIN_VERSION) if (i MATCHES "^QtCreator::") - set(_v ${IDE_VERSION}) string(REPLACE "QtCreator::" "" i ${i}) - else() - get_property(_v TARGET "${i}" PROPERTY QTC_PLUGIN_VERSION) endif() string(TOLOWER ${i} i) string(APPEND _arg_DEPENDENCY_STRING