diff options
| author | Kai Dohmen <psykai1993@googlemail.com> | 2020-09-21 12:15:00 +0200 |
|---|---|---|
| committer | Kai Dohmen <psykai1993@googlemail.com> | 2020-09-24 11:46:31 +0000 |
| commit | 82020280ac9a4f9082c4390a30d41473cf401c39 (patch) | |
| tree | c5dd4c185d7965e2cfec27944266b6b550ef8887 /share/qbs/modules/protobuf/nanopb/nanopb.qbs | |
| parent | 0d85123b3850f1df07184b018916525bc9a44e97 (diff) | |
| download | qbs-82020280ac9a4f9082c4390a30d41473cf401c39.tar.gz | |
Make protobuf.*.outputDir public again
Make protobuf outputDir public again for usage with installSourceBase
when creating/installing a separate proto-only library product. Make
outputDir readonly since it should not be set by the user. Changed
artifacts tag hpp to protobuf.hpp for better filtering.
Change-Id: I8697e880aacfe4d3029fd6f547a5d8c1eee7ee7e
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Diffstat (limited to 'share/qbs/modules/protobuf/nanopb/nanopb.qbs')
| -rw-r--r-- | share/qbs/modules/protobuf/nanopb/nanopb.qbs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/share/qbs/modules/protobuf/nanopb/nanopb.qbs b/share/qbs/modules/protobuf/nanopb/nanopb.qbs index 0dcfbb142..fdf95e2fd 100644 --- a/share/qbs/modules/protobuf/nanopb/nanopb.qbs +++ b/share/qbs/modules/protobuf/nanopb/nanopb.qbs @@ -23,7 +23,7 @@ ProtobufBase { } cpp.dynamicLibraries: "protobuf-nanopb" cpp.includePaths: { - var result = [_outputDir]; + var result = [outputDir]; if (includePath) result.push(includePath); return result; @@ -31,12 +31,13 @@ ProtobufBase { Rule { inputs: ["protobuf.input"] - outputFileTags: ["hpp", "cpp"] + outputFileTags: ["hpp", "protobuf.hpp", "cpp"] outputArtifacts: { var outputDir = HelperFunctions.getOutputDir(input.protobuf.nanopb, input); var result = [ - HelperFunctions.cppArtifact(outputDir, input, "hpp", ".pb.h"), - HelperFunctions.cppArtifact(outputDir, input, "cpp", ".pb.c") + HelperFunctions.cppArtifact(outputDir, input, ["hpp", "protobuf.hpp"], + ".pb.h"), + HelperFunctions.cppArtifact(outputDir, input, ["cpp"], ".pb.c") ]; return result; |