diff options
| -rw-r--r-- | share/qbs/imports/qbs/base/Application.qbs | 4 | ||||
| -rw-r--r-- | share/qbs/imports/qbs/base/Library.qbs | 8 | ||||
| -rw-r--r-- | share/qbs/imports/qbs/base/NativeBinary.qbs | 3 |
3 files changed, 10 insertions, 5 deletions
diff --git a/share/qbs/imports/qbs/base/Application.qbs b/share/qbs/imports/qbs/base/Application.qbs index 80ee7b51e..76536c68e 100644 --- a/share/qbs/imports/qbs/base/Application.qbs +++ b/share/qbs/imports/qbs/base/Application.qbs @@ -60,7 +60,7 @@ NativeBinary { installDir: isBundle ? "Applications" : "bin" Group { - condition: install + condition: install && _installable fileTagsFilter: isBundle ? "bundle.content" : "application" qbs.install: true qbs.installDir: installDir @@ -68,7 +68,7 @@ NativeBinary { } Group { - condition: installDebugInformation + condition: installDebugInformation && _installable fileTagsFilter: ["debuginfo_app"] qbs.install: true qbs.installDir: debugInformationInstallDir diff --git a/share/qbs/imports/qbs/base/Library.qbs b/share/qbs/imports/qbs/base/Library.qbs index c8a114624..914d79bcb 100644 --- a/share/qbs/imports/qbs/base/Library.qbs +++ b/share/qbs/imports/qbs/base/Library.qbs @@ -52,7 +52,7 @@ NativeBinary { property string importLibInstallDir: "lib" Group { - condition: install + condition: install && _installable fileTagsFilter: { if (isBundle) return ["bundle.content"]; @@ -70,14 +70,16 @@ NativeBinary { } Group { - condition: installImportLib && type.contains("dynamiclibrary") + condition: installImportLib + && type.contains("dynamiclibrary") + && _installable fileTagsFilter: "dynamiclibrary_import" qbs.install: true qbs.installDir: importLibInstallDir } Group { - condition: installDebugInformation + condition: installDebugInformation && _installable fileTagsFilter: { if (isDynamicLibrary) return ["debuginfo_dll"]; diff --git a/share/qbs/imports/qbs/base/NativeBinary.qbs b/share/qbs/imports/qbs/base/NativeBinary.qbs index 0928e96bb..c51f132ee 100644 --- a/share/qbs/imports/qbs/base/NativeBinary.qbs +++ b/share/qbs/imports/qbs/base/NativeBinary.qbs @@ -35,6 +35,9 @@ Product { property bool install: false property string installDir + // Product artifacts should be installed if it's not multiplexed or aggregated, + // or if it is multiplexed and it's the aggregate product + readonly property bool _installable: !multiplexed || !aggregate || !multiplexConfigurationId property bool installDebugInformation: false property string debugInformationInstallDir: installDir |