Skip to content

Commit e7e5d83

Browse files
authored
Fix grpc version in cmake (#15391)
1 parent d2cfcc8 commit e7e5d83

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

Firestore/core/CMakeLists.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,15 @@ target_include_directories(
245245
${PROJECT_SOURCE_DIR}/Firestore/core/include
246246
)
247247

248+
# Add the gRPC include directories as SYSTEM directories to silence warnings
249+
target_include_directories(
250+
firestore_core
251+
SYSTEM # The SYSTEM keyword applies to all directories in this block
252+
PUBLIC
253+
# This generator expression automatically gets the correct include path(s) from the grpc++ target
254+
$<TARGET_PROPERTY:grpc++,INTERFACE_INCLUDE_DIRECTORIES>
255+
)
256+
248257
target_link_libraries(
249258
firestore_core PUBLIC
250259
LevelDB::LevelDB

cmake/external/grpc.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ if(TARGET grpc)
1818
return()
1919
endif()
2020

21-
set(version 1.62.0)
21+
set(version 1.69.0)
2222

2323
ExternalProject_Add(
2424
grpc
2525

2626
DOWNLOAD_DIR ${FIREBASE_DOWNLOAD_DIR}
2727
DOWNLOAD_NAME grpc-${version}.tar.gz
2828
URL https://github.com/grpc/grpc/archive/v${version}.tar.gz
29-
URL_HASH SHA256=f40bde4ce2f31760f65dc49a2f50876f59077026494e67dccf23992548b1b04f
29+
URL_HASH SHA256=cd256d91781911d46a57506978b3979bfee45d5086a1b6668a3ae19c5e77f8dc
3030

3131
PREFIX ${PROJECT_BINARY_DIR}
3232
SOURCE_DIR ${PROJECT_BINARY_DIR}/src/grpc

0 commit comments

Comments
 (0)