diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2019-09-23 17:13:24 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2019-10-10 07:40:49 +0000 |
| commit | 73ed687cf11cb2d4e7f263ef5754039b96b69aaa (patch) | |
| tree | c01dcb59c5c6b32d8c4f5ce0bd667b39a5cf323f /src/app | |
| parent | c84f4c258ef91c76e19198d7eeb64291d0171938 (diff) | |
Fix static build
Make sure we link in the generator plugins.
Fixes: QBS-1491
Change-Id: I8c48a73f972c4089cfc8c097a67e2945837e9ed4
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/qbs/qbs.pro | 15 | ||||
| -rw-r--r-- | src/app/qbs/qbs.qbs | 4 |
2 files changed, 19 insertions, 0 deletions
diff --git a/src/app/qbs/qbs.pro b/src/app/qbs/qbs.pro index e9f0061c6..6ce449aad 100644 --- a/src/app/qbs/qbs.pro +++ b/src/app/qbs/qbs.pro @@ -37,3 +37,18 @@ isEmpty(QBS_RELATIVE_SEARCH_PATH):QBS_RELATIVE_SEARCH_PATH=.. DEFINES += QBS_RELATIVE_LIBEXEC_PATH=\\\"$${QBS_RELATIVE_LIBEXEC_PATH}\\\" DEFINES += QBS_RELATIVE_PLUGINS_PATH=\\\"$${QBS_RELATIVE_PLUGINS_PATH}\\\" DEFINES += QBS_RELATIVE_SEARCH_PATH=\\\"$${QBS_RELATIVE_SEARCH_PATH}\\\" + +CONFIG(static, static|shared) { + include(../../plugins/qbs_plugin_common.pri) + LIBS += -L$$qbsPluginDestDir + scannerPlugins = cpp qt + for (scannerPlugin, scannerPlugins) { + include(../../plugins/scanner/$$scannerPlugin/$${scannerPlugin}.pri) \ + include(../../plugins/use_plugin.pri) + } + generatorPlugins = clangcompilationdb iarew keiluv makefilegenerator visualstudio + for (generatorPlugin, generatorPlugins) { + include(../../plugins/generator/$$generatorPlugin/$${generatorPlugin}.pri) \ + include(../../plugins/use_plugin.pri) + } +} diff --git a/src/app/qbs/qbs.qbs b/src/app/qbs/qbs.qbs index 91357445e..530036f3a 100644 --- a/src/app/qbs/qbs.qbs +++ b/src/app/qbs/qbs.qbs @@ -5,6 +5,10 @@ QbsApp { name: "qbs_app" Depends { name: "qbs resources" } targetName: "qbs" + Depends { + condition: Qt.core.staticBuild || qbsbuildconfig.staticBuild + productTypes: ["qbsplugin"] + } cpp.defines: base.concat([ "QBS_VERSION=" + Utilities.cStringQuote(qbsversion.version), "QBS_RELATIVE_LIBEXEC_PATH=" + Utilities.cStringQuote(qbsbuildconfig.relativeLibexecPath), |