diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2023-06-25 15:26:57 +0300 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2023-06-28 13:30:55 +0000 |
| commit | e0f831bd8a9016b4b8a536e5eb08dda262173e93 (patch) | |
| tree | b8cf6f0546dd4cd962ad3f16e6d81a5be39d1283 /share/qbs/modules | |
| parent | e10db9409bebab761d52c966536f114310ec93d3 (diff) | |
Export cxxLanguageVersion from protobuf modules
This amends eb008eac0535ac8265cbacb449fac6806204ebe3.
Change-Id: Iab410d81c9f708aa1363bc9ca969cb219fe797b5
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'share/qbs/modules')
| -rw-r--r-- | share/qbs/modules/protobuf/cpp/protobufcpp.qbs | 3 | ||||
| -rw-r--r-- | share/qbs/modules/protobuf/nanopb/nanopb.qbs | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/share/qbs/modules/protobuf/cpp/protobufcpp.qbs b/share/qbs/modules/protobuf/cpp/protobufcpp.qbs index ae218a0c2..af1a5d2cd 100644 --- a/share/qbs/modules/protobuf/cpp/protobufcpp.qbs +++ b/share/qbs/modules/protobuf/cpp/protobufcpp.qbs @@ -18,6 +18,8 @@ ProtobufBase { property string grpcIncludePath: grpcIncludeProbe.found ? grpcIncludeProbe.path : undefined property string grpcLibraryPath: grpcLibraryProbe.found ? grpcLibraryProbe.path : undefined + property string _cxxLanguageVersion: qbs.targetOS.contains("darwin") ? "c++17" : "c++14" + readonly property string _libraryName: { var libraryName; if (libraryProbe.found) { @@ -87,6 +89,7 @@ ProtobufBase { result.push(grpcIncludePath); return result; } + cpp.cxxLanguageVersion: _cxxLanguageVersion Rule { inputs: ["protobuf.input", "protobuf.grpc"] diff --git a/share/qbs/modules/protobuf/nanopb/nanopb.qbs b/share/qbs/modules/protobuf/nanopb/nanopb.qbs index 898e230b6..ada7c20bb 100644 --- a/share/qbs/modules/protobuf/nanopb/nanopb.qbs +++ b/share/qbs/modules/protobuf/nanopb/nanopb.qbs @@ -41,6 +41,7 @@ ProtobufBase { result.push(includePath); return result; } + cpp.cxxLanguageVersion: qbs.targetOS.contains("darwin") ? ["c++17"] : ["c++11"] Rule { inputs: ["protobuf.input"] |