Skip to content
Permalink
Browse files

Use the latest grpc.

  • Loading branch information...
egorpugin committed Oct 13, 2019
1 parent 94d7308 commit c23ae4675349625bb96f944cf058715ac311e0b8
Showing with 4 additions and 7 deletions.
  1. +1 −1 src/sw/tools/self_builder.cpp
  2. +3 −6 sw.cpp
@@ -68,7 +68,7 @@ void write_build_script(const std::unordered_map<UnresolvedPackage, LocalPackage
{"org.sw.demo.google.protobuf.protobuf"},

// goes before sw cpp driver (client)
{"org.sw.demo.google.grpc.cpp.plugin-1.23"},
{"org.sw.demo.google.grpc.cpp.plugin"},

// goes before sw cpp driver (client)
{"pub.egorpugin.primitives.filesystem-master"},
9 sw.cpp
@@ -1,5 +1,5 @@
#pragma sw require header pub.egorpugin.primitives.tools.embedder-master
#pragma sw require header org.sw.demo.google.grpc.cpp.plugin-1.23
#pragma sw require header org.sw.demo.google.grpc.cpp.plugin
#pragma sw require header org.sw.demo.lexxmark.winflexbison.bison-master
#pragma sw require header org.sw.demo.qtproject.qt.base.tools.moc-*

@@ -66,15 +66,12 @@ void build(Solution &s)
{
protos.CPPVersion = CPPLanguageStandard::CPP17;
protos += "src/sw/protocol/.*"_rr;
protos.Public +=
"org.sw.demo.google.grpc.cpp-1.23"_dep,
"pub.egorpugin.primitives.templates-master"_dep,
"pub.egorpugin.primitives.log-master"_dep;
protos.Public += "pub.egorpugin.primitives.grpc_helpers-master"_dep;
ProtobufData d;
d.public_protobuf = true;
d.addIncludeDirectory(protos.SourceDir / "src");
for (auto &[p, _] : protos["src/sw/protocol/.*\\.proto"_rr])
gen_grpc_cpp("org.sw.demo.google.protobuf"_dep, "org.sw.demo.google.grpc.cpp.plugin-1.23"_dep, protos, p, d);
gen_grpc_cpp("org.sw.demo.google.protobuf"_dep, "org.sw.demo.google.grpc.cpp.plugin"_dep, protos, p, d);
}

auto &manager = p.addTarget<LibraryTarget>("manager");

0 comments on commit c23ae46

Please sign in to comment.
You can’t perform that action at this time.