Skip to content

Commit

Permalink
Upgrade to grpc 150 and c++14 for cmake build (firebase#10651)
Browse files Browse the repository at this point in the history
* Upgrade grpc to 150 and C++ to 14 on Cocoapods and SPM

* Minor fixes

* Upgrade to grpc 150 and c++14 for cmake build

* Add sha256

* Revert "Minor fixes"

This reverts commit 143a3ca.

* Revert "Upgrade grpc to 150 and C++ to 14 on Cocoapods and SPM"

This reverts commit 8205984.
  • Loading branch information
wu-hui authored Apr 3, 2023
1 parent a446367 commit 5677db8
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions cmake/compiler_setup.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

# C++ Compiler setup

# We use C++11
set(CMAKE_CXX_STANDARD 11)
# We use C++14
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)

Expand Down
4 changes: 2 additions & 2 deletions cmake/external/abseil-cpp.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@

include(ExternalProject)

set(version 20211102.0)
set(version 20220623.0)

ExternalProject_Add(
abseil-cpp

DOWNLOAD_DIR ${FIREBASE_DOWNLOAD_DIR}
DOWNLOAD_NAME abseil-cpp-${version}.tar.gz
URL https://github.com/abseil/abseil-cpp/archive/${version}.tar.gz
URL_HASH SHA256=dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4
URL_HASH SHA256=4208129b49006089ba1d6710845a45e31c59b0ab6bff9e5788a87f55c5abd602

PREFIX ${PROJECT_BINARY_DIR}

Expand Down
4 changes: 2 additions & 2 deletions cmake/external/grpc.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ if(TARGET grpc)
return()
endif()

set(version 1.44.0)
set(version 1.50.0)

ExternalProject_Add(
grpc

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=8c05641b9f91cbc92f51cc4a5b3a226788d7a63f20af4ca7aaca50d92cc94a0d
URL_HASH SHA256=76900ab068da86378395a8e125b5cc43dfae671e09ff6462ddfef18676e2165a

PREFIX ${PROJECT_BINARY_DIR}
SOURCE_DIR ${PROJECT_BINARY_DIR}/src/grpc
Expand Down

0 comments on commit 5677db8

Please sign in to comment.