diff options
| author | manuel <manuel@mausz.at> | 2011-05-12 18:07:31 +0200 |
|---|---|---|
| committer | manuel <manuel@mausz.at> | 2011-05-12 18:07:31 +0200 |
| commit | b0d63dc95ab5ed4496e0c4b888af06edace456d4 (patch) | |
| tree | de781901dd013bea2b65ca22b157ac239664def9 /pacman-c++/proto | |
| parent | 4b555b550f2b140d03fbffe56064a894ad7a43f1 (diff) | |
| download | foop-b0d63dc95ab5ed4496e0c4b888af06edace456d4.tar.gz foop-b0d63dc95ab5ed4496e0c4b888af06edace456d4.tar.bz2 foop-b0d63dc95ab5ed4496e0c4b888af06edace456d4.zip | |
- fix protoc call on osx (that's the correct way now anyway)
- fix compiler warning
Diffstat (limited to 'pacman-c++/proto')
| -rw-r--r-- | pacman-c++/proto/protobuf.pri | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pacman-c++/proto/protobuf.pri b/pacman-c++/proto/protobuf.pri index 718cb70..38fccde 100644 --- a/pacman-c++/proto/protobuf.pri +++ b/pacman-c++/proto/protobuf.pri | |||
| @@ -16,11 +16,12 @@ | |||
| 16 | PROTOPATH += . | 16 | PROTOPATH += . |
| 17 | PROTOPATHS = | 17 | PROTOPATHS = |
| 18 | for(p, PROTOPATH):PROTOPATHS += --proto_path=$${p} | 18 | for(p, PROTOPATH):PROTOPATHS += --proto_path=$${p} |
| 19 | PROTOPATHS += $$join(INCLUDEPATH, " -I", "-I") | ||
| 19 | 20 | ||
| 20 | protobuf_decl.name = protobuf header | 21 | protobuf_decl.name = protobuf header |
| 21 | protobuf_decl.input = PROTOS | 22 | protobuf_decl.input = PROTOS |
| 22 | protobuf_decl.output = ${QMAKE_FILE_BASE}.pb.h | 23 | protobuf_decl.output = ${QMAKE_FILE_BASE}.pb.h |
| 23 | protobuf_decl.commands = protoc --cpp_out="." $${PROTOPATHS} $(INCPATH) ${QMAKE_FILE_IN} | 24 | protobuf_decl.commands = protoc --cpp_out="." $${PROTOPATHS} -I ${QMAKE_FILE_IN_PATH} ${QMAKE_FILE_IN} |
| 24 | protobuf_decl.variable_out = GENERATED_FILES | 25 | protobuf_decl.variable_out = GENERATED_FILES |
| 25 | QMAKE_EXTRA_COMPILERS += protobuf_decl | 26 | QMAKE_EXTRA_COMPILERS += protobuf_decl |
| 26 | 27 | ||