Skip to content

Commit 129cafa

Browse files
committed
CMake grpc upgrade to 1.44.0
1 parent 85e1396 commit 129cafa

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,13 @@ else()
174174
set(ZLIB_ROOT_DIR ${FIREBASE_EXTERNAL_SOURCE_DIR}/zlib)
175175
endif()
176176

177+
find_package(re2 QUIET)
178+
if(RE2_FOUND)
179+
set(gRPC_RE2_PROVIDER package CACHE STRING "Use external re2")
180+
else()
181+
set(RE2_ROOT_DIR ${FIREBASE_EXTERNAL_SOURCE_DIR}/re2)
182+
endif()
183+
177184
set(gRPC_BUILD_TESTS OFF CACHE BOOL "Disable gRPC tests")
178185
set(gRPC_BUILD_CODEGEN OFF CACHE BOOL "Disable gRPC codegen")
179186
set(gRPC_BUILD_CSHARP_EXT OFF CACHE BOOL "Disable gRPC C# extensions")

cmake/external/protobuf.cmake

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,17 @@ if(TARGET protobuf)
1818
return()
1919
endif()
2020

21-
# Based on https://github.com/grpc/grpc/blob/v1.44.0/bazel/grpc_deps.bzl
22-
set(commit cb46755e6405e083b45481f5ea4754b180705529)
21+
# Based on https://github.com/grpc/grpc/blob/v1.27.0/bazel/grpc_deps.bzl
22+
# v3.11.4, master@{2020-01-15}
23+
set(commit 29cd005ce1fe1a8fabf11e325cb13006a6646d59)
2324

2425
ExternalProject_Add(
2526
protobuf
2627

2728
DOWNLOAD_DIR ${FIREBASE_DOWNLOAD_DIR}
2829
DOWNLOAD_NAME protobuf-${commit}.tar.gz
2930
URL https://github.com/protocolbuffers/protobuf/archive/${commit}.tar.gz
30-
URL_HASH SHA256=1f11c0cb85d5006da7032ac588f87e2e3eb28e9b095f81aba8956cb3635c8d4e
31+
URL_HASH SHA256=51398b0b97b353c1c226d0ade0bae80c80380e691cba7c1a108918986784a1c7
3132

3233
PREFIX ${PROJECT_BINARY_DIR}
3334
SOURCE_DIR ${PROJECT_BINARY_DIR}/src/protobuf

0 commit comments

Comments
 (0)