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/objc/protobufobjc.qbs | |
| parent | 38bec94ff92bc117906906cfff9b2b08fc74dfab (diff) | |
| parent | c823a66cd0097a7c009fcaba3c6618da792ef638 (diff) | |
Merge "Merge branch '1.16'"
Diffstat (limited to 'share/qbs/modules/protobuf/objc/protobufobjc.qbs')
| -rw-r--r-- | share/qbs/modules/protobuf/objc/protobufobjc.qbs | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/share/qbs/modules/protobuf/objc/protobufobjc.qbs b/share/qbs/modules/protobuf/objc/protobufobjc.qbs index e2c4b5260..151d0d80d 100644 --- a/share/qbs/modules/protobuf/objc/protobufobjc.qbs +++ b/share/qbs/modules/protobuf/objc/protobufobjc.qbs @@ -12,23 +12,12 @@ ProtobufBase { Depends { name: "cpp" } - // library build - Properties { - condition: !frameworkPath - cpp.includePaths: [outputDir, includePath] - cpp.libraryPaths: [libraryPath] - cpp.frameworks: ["Foundation"] - cpp.dynamicLibraries: ["ProtocolBuffers"] - } - - // framework build - Properties { - condition: frameworkPath - cpp.includePaths: [outputDir] - cpp.frameworkPaths: [frameworkPath] - cpp.frameworks: ["Foundation", "Protobuf"] - cpp.defines: ["GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS"] - } + cpp.includePaths: [outputDir].concat(!frameworkPath && includePath ? [includePath] : []) + cpp.libraryPaths: !frameworkPath && libraryPath ? [libraryPath] : [] + cpp.dynamicLibraries: !frameworkPath && libraryPath ? ["ProtocolBuffers"] : [] + cpp.frameworkPaths: frameworkPath ? [frameworkPath] : [] + cpp.frameworks: ["Foundation"].concat(frameworkPath ? ["Protobuf"] : []) + cpp.defines: frameworkPath ? ["GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS"] : [] Rule { inputs: ["protobuf.input"] |