diff options
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/external/grpc.cmake | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/cmake/external/grpc.cmake b/cmake/external/grpc.cmake index 0af6b31..d545087 100644 --- a/cmake/external/grpc.cmake +++ b/cmake/external/grpc.cmake @@ -68,7 +68,15 @@ else() PREFIX ${PROJECT_BINARY_DIR}/external/grpc - CMAKE_ARGS ${CMAKE_ARGS} + # TODO(rsgowman): We're currently building nanopb twice; once via grpc, and + # once via nanopb. The version from grpc is the one that actually ends up + # being used. We need to fix this such that either: + # a) we instruct grpc to use our nanopb + # b) we rely on grpc's nanopb instead of using our own. + # For now, we'll pass in the necessary nanopb cflags into grpc. (We require + # 16 bit fields. Without explicitly requesting this, nanopb uses 8 bit + # fields.) + CMAKE_ARGS ${CMAKE_ARGS};-DCMAKE_C_FLAGS=-DPB_FIELD_16BIT;DCMAKE_CXX_FLAGS=-DPB_FIELD_16BIT BUILD_COMMAND ${CMAKE_COMMAND} --build . --target grpc |