From 4c34bcefd5e51d05d0163eb023e579ccd06b1629 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Fri, 10 May 2019 15:34:42 +0200 Subject: [PATCH] Keep it as a compiler, but also add it as a target --- plugins/plugins.pri | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/plugins/plugins.pri b/plugins/plugins.pri index 2d2919fd..0f7f5ce9 100644 --- a/plugins/plugins.pri +++ b/plugins/plugins.pri @@ -10,7 +10,10 @@ LIBS += -L../../libnymea -lnymea HEADERS += plugininfo.h # Create plugininfo file -plugininfo.target = plugininfo +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 \ --filetype i \ --jsonfile $$PWD/$$TARGET/deviceplugin"$$TARGET".json \ @@ -21,10 +24,11 @@ plugininfo.commands = $$top_srcdir/plugins/nymea-generateplugininfo \ --jsonfile $$PWD/$$TARGET/deviceplugin"$$TARGET".json \ --output extern-plugininfo.h \ --builddir $$OUT_PWD; +# Add it as a compiler, so it will be called before building like moc +QMAKE_EXTRA_COMPILERS += plugininfo +# But also add it as a target so we can add it separately without building. E.g. for updating translations. QMAKE_EXTRA_TARGETS += plugininfo -PRE_TARGETDEPS += plugininfo - # Install plugin target.path = $$[QT_INSTALL_LIBS]/nymea/plugins/ INSTALLS += target