diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2016-09-06 18:08:05 +0200 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2016-09-08 21:45:44 +0000 |
| commit | d17105376102c4cd846757c7f091b9f3cd90e4d7 (patch) | |
| tree | 90e5bcddb2a8559301eb1e292ac84d294177fc17 | |
| parent | 310dad35b8b0d3d7c45301c0d007714e29f0b204 (diff) | |
Don't install static library products
Change-Id: I09e87843b5df2d7f1f1a7f8fc0558f40ec97fe9a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
4 files changed, 5 insertions, 2 deletions
diff --git a/qbs-resources/imports/QbsLibrary.qbs b/qbs-resources/imports/QbsLibrary.qbs index b8649b2cc..0e5fdf03a 100644 --- a/qbs-resources/imports/QbsLibrary.qbs +++ b/qbs-resources/imports/QbsLibrary.qbs @@ -16,12 +16,12 @@ QbsProduct { property string headerInstallPrefix: "/include/qbs" Group { fileTagsFilter: product.type.concat("dynamiclibrary_symlink") - qbs.install: true + qbs.install: install qbs.installDir: qbsbuildconfig.libInstallDir } Group { fileTagsFilter: ["dynamiclibrary_import"] - qbs.install: true + qbs.install: install qbs.installDir: qbsbuildconfig.importLibInstallDir } diff --git a/qbs-resources/imports/QbsProduct.qbs b/qbs-resources/imports/QbsProduct.qbs index 305e4c755..d882852df 100644 --- a/qbs-resources/imports/QbsProduct.qbs +++ b/qbs-resources/imports/QbsProduct.qbs @@ -5,6 +5,7 @@ Product { Depends { name: "qbsbuildconfig" } Depends { name: "Qt.core" } property string minimumQtVersion: "5.4.0" + property bool install: true cpp.defines: { var res = ["QT_NO_CAST_FROM_ASCII", "QT_NO_PROCESS_COMBINED_ARGUMENT_START"]; if (qbs.toolchain.contains("msvc")) diff --git a/src/lib/corelib/generators/clangcompilationdb/clangcompilationdb.qbs b/src/lib/corelib/generators/clangcompilationdb/clangcompilationdb.qbs index 745223401..c8f626190 100644 --- a/src/lib/corelib/generators/clangcompilationdb/clangcompilationdb.qbs +++ b/src/lib/corelib/generators/clangcompilationdb/clangcompilationdb.qbs @@ -3,6 +3,7 @@ import qbs QbsLibrary { type: ["staticlibrary"] name: "clangcompilationdbgenerator" + install: false cpp.includePaths: base.concat([ "../..", diff --git a/src/lib/corelib/generators/visualstudio/visualstudio.qbs b/src/lib/corelib/generators/visualstudio/visualstudio.qbs index 380a20052..44694d8d2 100644 --- a/src/lib/corelib/generators/visualstudio/visualstudio.qbs +++ b/src/lib/corelib/generators/visualstudio/visualstudio.qbs @@ -3,6 +3,7 @@ import qbs QbsLibrary { type: ["staticlibrary"] name: "visualstudiogenerator" + install: false cpp.includePaths: base.concat([ "../..", |