From 8698a5c1af69326af1812cc74f5b521de9a9c5be Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Mon, 6 May 2019 16:11:28 +0200 Subject: [PATCH] move generateplugininfo to libnymea --- libnymea/libnymea.pro | 2 +- {plugins => libnymea/plugin}/nymea-generateplugininfo | 0 plugins/plugins.pri | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename {plugins => libnymea/plugin}/nymea-generateplugininfo (100%) diff --git a/libnymea/libnymea.pro b/libnymea/libnymea.pro index 3abebf98..0324f856 100644 --- a/libnymea/libnymea.pro +++ b/libnymea/libnymea.pro @@ -129,7 +129,7 @@ RESOURCES += \ ## Install instructions # install plugininfo python script for libnymea-dev -generateplugininfo.files = $$top_srcdir/plugins/nymea-generateplugininfo +generateplugininfo.files = plugin/nymea-generateplugininfo generateplugininfo.path = $$[QT_INSTALL_PREFIX]/bin INSTALLS += generateplugininfo diff --git a/plugins/nymea-generateplugininfo b/libnymea/plugin/nymea-generateplugininfo similarity index 100% rename from plugins/nymea-generateplugininfo rename to libnymea/plugin/nymea-generateplugininfo diff --git a/plugins/plugins.pri b/plugins/plugins.pri index 9b106c94..405d9dd6 100644 --- a/plugins/plugins.pri +++ b/plugins/plugins.pri @@ -14,7 +14,7 @@ JSONFILE=$$PWD/$$TARGET/deviceplugin"$$TARGET".json plugininfo.input = JSONFILE plugininfo.output = plugininfo.h plugininfo.CONFIG = no_link target_predeps -plugininfo.commands = $$top_srcdir/plugins/nymea-generateplugininfo \ +plugininfo.commands = $$top_srcdir/libnymea/plugin/nymea-generateplugininfo \ --filetype i \ --jsonfile $$PWD/$$TARGET/deviceplugin"$$TARGET".json \ --output plugininfo.h \