diff options
| author | The Qt Project <gerrit-noreply@qt-project.org> | 2020-05-22 08:27:52 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2020-05-22 08:27:52 +0000 |
| commit | 6bba36e5e76820409bd3afad5da6883a79f79904 (patch) | |
| tree | 44aeaba9f356876c7240b7f49dc6d6dd255a59fe /share/qbs/modules/protobuf/cpp/protobufcpp.qbs | |
| parent | 38bec94ff92bc117906906cfff9b2b08fc74dfab (diff) | |
| parent | c823a66cd0097a7c009fcaba3c6618da792ef638 (diff) | |
Merge "Merge branch '1.16'"
Diffstat (limited to 'share/qbs/modules/protobuf/cpp/protobufcpp.qbs')
| -rw-r--r-- | share/qbs/modules/protobuf/cpp/protobufcpp.qbs | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/share/qbs/modules/protobuf/cpp/protobufcpp.qbs b/share/qbs/modules/protobuf/cpp/protobufcpp.qbs index 4d5228813..450286805 100644 --- a/share/qbs/modules/protobuf/cpp/protobufcpp.qbs +++ b/share/qbs/modules/protobuf/cpp/protobufcpp.qbs @@ -26,8 +26,10 @@ ProtobufBase { } cpp.libraryPaths: { - var result = [libraryPath]; - if (useGrpc) + var result = []; + if (libraryPath) + result.push(libraryPath); + if (useGrpc && grpcLibraryPath) result.push(grpcLibraryPath); return result; } @@ -40,8 +42,10 @@ ProtobufBase { return result; } cpp.includePaths: { - var result = [outputDir, includePath]; - if (useGrpc) + var result = [outputDir]; + if (includePath) + result.push(includePath); + if (useGrpc && grpcIncludePath) result.push(grpcIncludePath); return result; } |