diff options
| author | Jeong YunWon <youknowone@users.noreply.github.com> | 2021-03-26 04:12:35 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-25 12:12:35 -0700 |
| commit | 276b1bc342d23142e4b2b9b9fadbf076474deec9 (patch) | |
| tree | 11aa2c405876cb0c50e410ccf251fd250b1ca2dc /CMakeLists.txt | |
| parent | 124654ffc4ef8ee8a67aca8af3d9a6e58bd38f59 (diff) | |
| download | flatbuffers-276b1bc342d23142e4b2b9b9fadbf076474deec9.tar.gz flatbuffers-276b1bc342d23142e4b2b9b9fadbf076474deec9.tar.bz2 flatbuffers-276b1bc342d23142e4b2b9b9fadbf076474deec9.zip | |
[grpc] Support latest version of grpc PoC (#6338)
* use grpcpp rather than deprecated grpc++
* grpcpp Deserialize take ByteBuffer instead of grpc_byte_buffer
* grpc 1.36.0
* Fix to use grpc 1.36.0
* Fix CMakeLists to refer gRPC
* add find_package(Threads)
* Update bazel deps
* Apply workaround about boringssl build error
* Install latest cmake for osx on travis-ci
Co-authored-by: Yeom Gyusun <omniavinco@gmail.com>
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ba14f7c2..1dc6465f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -543,10 +543,13 @@ if(FLATBUFFERS_BUILD_GRPCTEST) endif() INCLUDE_DIRECTORIES(${GRPC_INSTALL_PATH}/include) INCLUDE_DIRECTORIES(${PROTOBUF_DOWNLOAD_PATH}/src) - LINK_DIRECTORIES(${GRPC_INSTALL_PATH}/lib) + find_package(Threads REQUIRED) + list(APPEND CMAKE_PREFIX_PATH ${GRPC_INSTALL_PATH}) + find_package(protobuf CONFIG REQUIRED) + find_package(gRPC CONFIG REQUIRED) add_executable(grpctest ${FlatBuffers_GRPCTest_SRCS}) add_dependencies(grpctest generated_code) - target_link_libraries(grpctest PRIVATE grpc++_unsecure grpc_unsecure gpr pthread dl) + target_link_libraries(grpctest PRIVATE gRPC::grpc++_unsecure gRPC::grpc_unsecure gRPC::gpr pthread dl) if(FLATBUFFERS_CODE_SANITIZE AND NOT WIN32) # GRPC test has problems with alignment and will fail under ASAN/UBSAN. # add_fsanitize_to_target(grpctest ${FLATBUFFERS_CODE_SANITIZE}) |