diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2016-06-15 02:18:24 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2016-06-16 11:50:19 +0000 |
| commit | 071e04c18f1218a01a88f0dffe8be83301f74f7a (patch) | |
| tree | 93f8e676e090b86a6d205f7670015d985f586b6b /qbs-resources | |
| parent | ded5fe2c0cb9489f4201d8468d8a4a21e972b903 (diff) | |
Generate a proper install tree for the dist target.
Now adds Incredibuild files and Windows import libraries, and removes
some unnecessary files which bloat the distribution.
Change-Id: I5ec15b0bc5ae29fa1f6a5ecca314fc083756eb17
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Diffstat (limited to 'qbs-resources')
| -rw-r--r-- | qbs-resources/imports/QbsLibrary.qbs | 6 | ||||
| -rw-r--r-- | qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/qbs-resources/imports/QbsLibrary.qbs b/qbs-resources/imports/QbsLibrary.qbs index 2d3e10fb1..b8649b2cc 100644 --- a/qbs-resources/imports/QbsLibrary.qbs +++ b/qbs-resources/imports/QbsLibrary.qbs @@ -19,6 +19,12 @@ QbsProduct { qbs.install: true qbs.installDir: qbsbuildconfig.libInstallDir } + Group { + fileTagsFilter: ["dynamiclibrary_import"] + qbs.install: true + qbs.installDir: qbsbuildconfig.importLibInstallDir + } + Export { Depends { name: "cpp" } Depends { name: "Qt"; submodules: ["core"] } diff --git a/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs b/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs index 0ceca7dd4..b90d9916a 100644 --- a/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs +++ b/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs @@ -8,6 +8,7 @@ Module { property string libDirName: "lib" property string appInstallDir: "bin" property string libInstallDir: qbs.targetOS.contains("windows") ? "bin" : libDirName + property string importLibInstallDir: libDirName property string libexecInstallDir: "libexec/qbs" property string relativeLibexecPath: "../" + libexecInstallDir property string relativePluginsPath: "../" + libDirName |