From 94008aa71e138768190d743d8e9fc1cd26460222 Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Fri, 25 Sep 2020 10:22:20 +0200 Subject: [PATCH] CMake: Fix compilation error when QmlPlugin is not built Ammends 6fe11f80d62df7d9723b11ce9eae1ed1a790dc59 Change-Id: Ifa909d8e2946c4fdd8e2a5301bab2686a615d89a Reviewed-by: Kai Koehne --- cmake/QtCreatorAPIInternal.cmake | 6 +++++- src/plugins/qmldesigner/CMakeLists.txt | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cmake/QtCreatorAPIInternal.cmake b/cmake/QtCreatorAPIInternal.cmake index 34567dc2e23..5404680da0f 100644 --- a/cmake/QtCreatorAPIInternal.cmake +++ b/cmake/QtCreatorAPIInternal.cmake @@ -387,7 +387,7 @@ function(extend_qtc_target target_name) cmake_parse_arguments(_arg "" "SOURCES_PREFIX;FEATURE_INFO" - "CONDITION;DEPENDS;PUBLIC_DEPENDS;DEFINES;PUBLIC_DEFINES;INCLUDES;PUBLIC_INCLUDES;SOURCES;EXPLICIT_MOC;SKIP_AUTOMOC;EXTRA_TRANSLATIONS" + "CONDITION;DEPENDS;PUBLIC_DEPENDS;DEFINES;PUBLIC_DEFINES;INCLUDES;PUBLIC_INCLUDES;SOURCES;EXPLICIT_MOC;SKIP_AUTOMOC;EXTRA_TRANSLATIONS;PROPERTIES" ${ARGN} ) @@ -456,4 +456,8 @@ function(extend_qtc_target target_name) endforeach() append_extra_translations(${target_name} "${_arg_EXTRA_TRANSLATIONS}") + + if (_arg_PROPERTIES) + set_target_properties(${target_name} PROPERTIES ${_arg_PROPERTIES}) + endif() endfunction() diff --git a/src/plugins/qmldesigner/CMakeLists.txt b/src/plugins/qmldesigner/CMakeLists.txt index f5cdb2b75f5..3d09bd2d193 100644 --- a/src/plugins/qmldesigner/CMakeLists.txt +++ b/src/plugins/qmldesigner/CMakeLists.txt @@ -38,7 +38,7 @@ if (APPLE) set(QmlDesignerPluginInstallPrefix "${IDE_PLUGIN_PATH}/QmlDesigner") endif() -set_target_properties(QmlDesigner PROPERTIES QMLDESIGNER_PLUGIN_PATH "${QmlDesignerPluginInstallPrefix}") +extend_qtc_plugin(QmlDesigner PROPERTIES QMLDESIGNER_PLUGIN_PATH "${QmlDesignerPluginInstallPrefix}") add_qtc_plugin(assetexporterplugin CONDITION TARGET QmlDesigner