From c3d461d4948700796c19f848e127091ff1677f33 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 6 Oct 2020 08:21:09 +0200 Subject: [PATCH] CMake build: Add missing PROPERTIES to add_qtc_plugin And use it for QmlDesigner Change-Id: Id7221ee2288159ff2faaf4ac483570034927f1b4 Reviewed-by: Cristian Adam --- cmake/QtCreatorAPI.cmake | 2 +- src/plugins/qmldesigner/CMakeLists.txt | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cmake/QtCreatorAPI.cmake b/cmake/QtCreatorAPI.cmake index 4e8b7ba5336..bb1b4985e26 100644 --- a/cmake/QtCreatorAPI.cmake +++ b/cmake/QtCreatorAPI.cmake @@ -244,7 +244,7 @@ function(add_qtc_plugin target_name) cmake_parse_arguments(_arg "EXPERIMENTAL;SKIP_DEBUG_CMAKE_FILE_CHECK;SKIP_INSTALL;INTERNAL_ONLY;SKIP_TRANSLATION" "VERSION;COMPAT_VERSION;PLUGIN_JSON_IN;PLUGIN_PATH;PLUGIN_NAME;OUTPUT_NAME;BUILD_DEFAULT" - "CONDITION;DEPENDS;PUBLIC_DEPENDS;DEFINES;PUBLIC_DEFINES;INCLUDES;PUBLIC_INCLUDES;SOURCES;EXPLICIT_MOC;SKIP_AUTOMOC;EXTRA_TRANSLATIONS;PLUGIN_DEPENDS;PLUGIN_RECOMMENDS" + "CONDITION;DEPENDS;PUBLIC_DEPENDS;DEFINES;PUBLIC_DEFINES;INCLUDES;PUBLIC_INCLUDES;SOURCES;EXPLICIT_MOC;SKIP_AUTOMOC;EXTRA_TRANSLATIONS;PLUGIN_DEPENDS;PLUGIN_RECOMMENDS;PROPERTIES" ${ARGN} ) diff --git a/src/plugins/qmldesigner/CMakeLists.txt b/src/plugins/qmldesigner/CMakeLists.txt index 3d09bd2d193..d1c96d9410b 100644 --- a/src/plugins/qmldesigner/CMakeLists.txt +++ b/src/plugins/qmldesigner/CMakeLists.txt @@ -1,3 +1,8 @@ +set(QmlDesignerPluginInstallPrefix "${IDE_PLUGIN_PATH}/qmldesigner") +if (APPLE) + set(QmlDesignerPluginInstallPrefix "${IDE_PLUGIN_PATH}/QmlDesigner") +endif() + add_qtc_plugin(QmlDesigner DEPENDS QmlJS LanguageUtils QmlEditorWidgets AdvancedDockingSystem @@ -31,15 +36,10 @@ add_qtc_plugin(QmlDesigner SKIP_DEBUG_CMAKE_FILE_CHECK EXTRA_TRANSLATIONS "${PROJECT_SOURCE_DIR}/share/qtcreator/qmldesigner" + PROPERTIES + QMLDESIGNER_PLUGIN_PATH "${QmlDesignerPluginInstallPrefix}" ) -set(QmlDesignerPluginInstallPrefix "${IDE_PLUGIN_PATH}/qmldesigner") -if (APPLE) - set(QmlDesignerPluginInstallPrefix "${IDE_PLUGIN_PATH}/QmlDesigner") -endif() - -extend_qtc_plugin(QmlDesigner PROPERTIES QMLDESIGNER_PLUGIN_PATH "${QmlDesignerPluginInstallPrefix}") - add_qtc_plugin(assetexporterplugin CONDITION TARGET QmlDesigner DEPENDS Core ProjectExplorer QmlDesigner Utils Qt5::Qml