From 867416b531fdf630f18d5bba22cad27cb5270acc Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Wed, 31 Jan 2018 16:32:18 +0100 Subject: [PATCH] change how plugininfo.h is generated --- plugins.pri | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/plugins.pri b/plugins.pri index 28c4195..1eacbb4 100644 --- a/plugins.pri +++ b/plugins.pri @@ -19,30 +19,11 @@ snappy{ } # Create plugininfo file -JSONFILES = deviceplugin"$$TARGET".json -plugininfo.target = plugininfo.h -plugininfo.output = plugininfo.h -plugininfo.CONFIG = no_link -plugininfo.input = JSONFILES -plugininfo.commands = touch ${QMAKE_FILE_OUT}; guh-generateplugininfo \ - --filetype i \ - --jsonfile ${QMAKE_FILE_NAME} \ - --output ${QMAKE_FILE_OUT} \ - --builddir $$OUT_PWD; -PRE_TARGETDEPS += compiler_plugininfo_make_all -QMAKE_EXTRA_COMPILERS += plugininfo - -externplugininfo.target = extern-plugininfo.h -externplugininfo.output = extern-plugininfo.h -externplugininfo.CONFIG = no_link -externplugininfo.input = JSONFILES -externplugininfo.commands = touch ${QMAKE_FILE_OUT}; guh-generateplugininfo \ - --filetype e \ - --jsonfile ${QMAKE_FILE_NAME} \ - --output ${QMAKE_FILE_OUT} \ - --builddir $$OUT_PWD; -PRE_TARGETDEPS += compiler_externplugininfo_make_all -QMAKE_EXTRA_COMPILERS += externplugininfo +plugininfo.commands = guh-generateplugininfo --filetype i --jsonfile $$PWD/$${TARGET}/deviceplugin"$$TARGET".json --output plugininfo.h --builddir $$OUT_PWD; \ + guh-generateplugininfo --filetype e --jsonfile $$PWD/$${TARGET}/deviceplugin"$$TARGET".json --output extern-plugininfo.h --builddir $$OUT_PWD; +plugininfo.depends = FORCE +QMAKE_EXTRA_TARGETS += plugininfo +PRE_TARGETDEPS += plugininfo # Install translation files TRANSLATIONS *= $$files($${PWD}/$${TARGET}/translations/*ts, true) @@ -56,5 +37,6 @@ translations.files = $$[QT_SOURCE_TREE]/translations/*.qm # Install plugin target.path = $$PLUGIN_PATH +target.depends += plugininfo INSTALLS += target translations