فهرست منبع

Fix grpc version in cmake (#15391)

cherylEnkidu 5 ماه پیش
والد
کامیت
e7e5d8356a
2فایلهای تغییر یافته به همراه11 افزوده شده و 2 حذف شده
  1. 9 0
      Firestore/core/CMakeLists.txt
  2. 2 2
      cmake/external/grpc.cmake

+ 9 - 0
Firestore/core/CMakeLists.txt

@@ -245,6 +245,15 @@ target_include_directories(
   ${PROJECT_SOURCE_DIR}/Firestore/core/include
 )
 
+# Add the gRPC include directories as SYSTEM directories to silence warnings
+target_include_directories(
+  firestore_core
+  SYSTEM       # The SYSTEM keyword applies to all directories in this block
+  PUBLIC
+    # This generator expression automatically gets the correct include path(s) from the grpc++ target
+    $<TARGET_PROPERTY:grpc++,INTERFACE_INCLUDE_DIRECTORIES>
+)
+
 target_link_libraries(
   firestore_core PUBLIC
   LevelDB::LevelDB

+ 2 - 2
cmake/external/grpc.cmake

@@ -18,7 +18,7 @@ if(TARGET grpc)
   return()
 endif()
 
-set(version 1.62.0)
+set(version 1.69.0)
 
 ExternalProject_Add(
   grpc
@@ -26,7 +26,7 @@ ExternalProject_Add(
   DOWNLOAD_DIR ${FIREBASE_DOWNLOAD_DIR}
   DOWNLOAD_NAME grpc-${version}.tar.gz
   URL https://github.com/grpc/grpc/archive/v${version}.tar.gz
-  URL_HASH SHA256=f40bde4ce2f31760f65dc49a2f50876f59077026494e67dccf23992548b1b04f
+  URL_HASH SHA256=cd256d91781911d46a57506978b3979bfee45d5086a1b6668a3ae19c5e77f8dc
 
   PREFIX ${PROJECT_BINARY_DIR}
   SOURCE_DIR ${PROJECT_BINARY_DIR}/src/grpc