diff options
Diffstat (limited to 'share/qbs/modules')
| -rw-r--r-- | share/qbs/modules/Exporter/pkgconfig/pkgconfig.qbs | 7 | ||||
| -rw-r--r-- | share/qbs/modules/Exporter/qbs/qbsexporter.qbs | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/share/qbs/modules/Exporter/pkgconfig/pkgconfig.qbs b/share/qbs/modules/Exporter/pkgconfig/pkgconfig.qbs index 5fbda2bf4..aecad6126 100644 --- a/share/qbs/modules/Exporter/pkgconfig/pkgconfig.qbs +++ b/share/qbs/modules/Exporter/pkgconfig/pkgconfig.qbs @@ -32,11 +32,8 @@ Module { requiresInputs: false // Make sure all relevant library artifacts have been created by the time we run. - inputsFromDependencies: autoDetect - ? ["Exporter.pkgconfig.pc", "staticlibrary", "dynamiclibrary"] - : [] - inputs: { - if (!product.Exporter.pkgconfig.autoDetect) + auxiliaryInputs: { + if (!autoDetect) return undefined; if (product.type.contains("staticlibrary")) return ["staticlibrary"]; diff --git a/share/qbs/modules/Exporter/qbs/qbsexporter.qbs b/share/qbs/modules/Exporter/qbs/qbsexporter.qbs index 6cdc55891..351edfefe 100644 --- a/share/qbs/modules/Exporter/qbs/qbsexporter.qbs +++ b/share/qbs/modules/Exporter/qbs/qbsexporter.qbs @@ -49,7 +49,9 @@ Module { requiresInputs: false // Make sure we only run when all other artifacts are already present. - inputs: product.type.filter(function(t) { return t !== "Exporter.qbs.module"; }) + // TODO: This also matches target artifacts in dependencies. Should not hurt, + // but might be a hint that we should have auxiliaryInputsFromDependencies. + auxiliaryInputs: product.type.filter(function(t) { return t !== "Exporter.qbs.module"; }) Artifact { filePath: product.Exporter.qbs.fileName |