Skip to content

Update to c++ 17 #1837

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
AustinBenoit wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Update to c++ 17 #1837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
312953e
Update to c++ 17
AustinBenoit Feb 27, 2026
ab54ef1
add in some firestore patches to try and get things to build
AustinBenoit Mar 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

cmake_minimum_required(VERSION 3.22)

set (CMAKE_CXX_STANDARD 14)
set (CMAKE_CXX_STANDARD 17)
set (CMAKE_CXX_STANDARD_REQUIRED YES) # Don't fall back to an earlier version.

# Turn on virtual folders for visual studio
Expand Down
2 changes: 1 addition & 1 deletion analytics/integration_test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ set(FIREBASE_INTEGRATION_TEST_SRCS
include_directories(src)

# Firebase C++ SDK requires C++14.
set (CMAKE_CXX_STANDARD 14)
set (CMAKE_CXX_STANDARD 17)
Comment on lines 87 to +88
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot Feb 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

This comment is outdated. With the C++ standard updated to 17, this should be updated as well for consistency.

# Firebase C++ SDK requires C++17.
set (CMAKE_CXX_STANDARD 17)

set (CMAKE_CXX_STANDARD_REQUIRED YES) # Don't fall back to an earlier version.

# Download and unpack googletest (and googlemock) at configure time
Expand Down
2 changes: 1 addition & 1 deletion app/integration_test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ set(FIREBASE_INTEGRATION_TEST_SRCS
include_directories(src)

# Firebase C++ SDK requires C++14.
set (CMAKE_CXX_STANDARD 14)
set (CMAKE_CXX_STANDARD 17)
Comment on lines 87 to +88
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot Feb 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

This comment is outdated. With the C++ standard updated to 17, this should be updated as well for consistency.

# Firebase C++ SDK requires C++17.
set (CMAKE_CXX_STANDARD 17)

set (CMAKE_CXX_STANDARD_REQUIRED YES) # Don't fall back to an earlier version.

# Download and unpack googletest (and googlemock) at configure time
Expand Down
2 changes: 1 addition & 1 deletion app/rest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

cmake_minimum_required(VERSION 3.22)
# Firebase C++ SDK requires C++14.
set (CMAKE_CXX_STANDARD 14)
set (CMAKE_CXX_STANDARD 17)
Comment on lines 18 to +19
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot Feb 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

This comment is outdated. With the C++ standard updated to 17, this should be updated as well for consistency.

# Firebase C++ SDK requires C++17.
set (CMAKE_CXX_STANDARD 17)

set (CMAKE_CXX_STANDARD_REQUIRED YES) # Don't fall back to an earlier version.

project(firebase_rest_lib NONE)
Expand Down
2 changes: 1 addition & 1 deletion app_check/integration_test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ set(FIREBASE_INTEGRATION_TEST_SRCS
include_directories(src)

# Firebase C++ SDK requires C++14.
set (CMAKE_CXX_STANDARD 14)
set (CMAKE_CXX_STANDARD 17)
Comment on lines 87 to +88
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot Feb 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

This comment is outdated. With the C++ standard updated to 17, this should be updated as well for consistency.

# Firebase C++ SDK requires C++17.
set (CMAKE_CXX_STANDARD 17)

set (CMAKE_CXX_STANDARD_REQUIRED YES) # Don't fall back to an earlier version.

# Download and unpack googletest (and googlemock) at configure time
Expand Down
2 changes: 1 addition & 1 deletion auth/integration_test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ set(FIREBASE_INTEGRATION_TEST_SRCS
include_directories(src)

# Firebase C++ SDK requires C++14.
set (CMAKE_CXX_STANDARD 14)
set (CMAKE_CXX_STANDARD 17)
Comment on lines 87 to +88
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot Feb 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

This comment is outdated. With the C++ standard updated to 17, this should be updated as well for consistency.

# Firebase C++ SDK requires C++17.
set (CMAKE_CXX_STANDARD 17)

set (CMAKE_CXX_STANDARD_REQUIRED YES) # Don't fall back to an earlier version.

# Download and unpack googletest (and googlemock) at configure time
Expand Down
91 changes: 90 additions & 1 deletion cmake/external/firestore.patch.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,39 @@
---
cmake/external/grpc.cmake | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmake/external/grpc.cmake b/cmake/external/grpc.cmake
index 21d970a8d..cc7a038a5 100644
--- a/cmake/external/grpc.cmake
+++ b/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
--
2.51.0.710.ga91ca5db03-goog


---
cmake/external/leveldb.cmake | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/cmake/external/leveldb.cmake b/cmake/external/leveldb.cmake
index 920bf2928..c5c9cc7ee 100644
index 81ed8e6f1..32f1993c0 100644
--- a/cmake/external/leveldb.cmake
+++ b/cmake/external/leveldb.cmake
@@ -24,7 +24,10 @@ if(TARGET leveldb)
Expand All @@ -14,3 +48,58 @@ index 920bf2928..c5c9cc7ee 100644

ExternalProject_Get_property(snappy SOURCE_DIR)
set(snappy_source_dir "${SOURCE_DIR}")
--
2.51.0.710.ga91ca5db03-goog


---
Firestore/core/CMakeLists.txt | 9 +++++++++
1 file changed, 9 insertions(+)

diff --git a/Firestore/core/CMakeLists.txt b/Firestore/core/CMakeLists.txt
index cb4050748..90cd4af47 100644
--- a/Firestore/core/CMakeLists.txt
+++ b/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.51.0.710.ga91ca5db03-goog


---
cmake/compiler_setup.cmake | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cmake/compiler_setup.cmake b/cmake/compiler_setup.cmake
index 00e96033..0bfa1e40 100644
--- a/cmake/compiler_setup.cmake
+++ b/cmake/compiler_setup.cmake
@@ -17,9 +17,9 @@ include(CheckCXXCompilerFlag)
# C++ Compiler setup

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

if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
set(CXX_CLANG ON)
--
2.51.0.710.ga91ca5db03-goog
2 changes: 1 addition & 1 deletion database/integration_test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ set(FIREBASE_INTEGRATION_TEST_SRCS
include_directories(src)

# Firebase C++ SDK requires C++14.
set (CMAKE_CXX_STANDARD 14)
set (CMAKE_CXX_STANDARD 17)
Comment on lines 87 to +88
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot Feb 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

This comment is outdated. With the C++ standard updated to 17, this should be updated as well for consistency.

# Firebase C++ SDK requires C++17.
set (CMAKE_CXX_STANDARD 17)

set (CMAKE_CXX_STANDARD_REQUIRED YES) # Don't fall back to an earlier version.

# Download and unpack googletest (and googlemock) at configure time
Expand Down
2 changes: 1 addition & 1 deletion firestore/integration_test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ set(FIREBASE_INTEGRATION_TEST_SRCS
include_directories(src)

# Firebase C++ SDK requires C++14.
set (CMAKE_CXX_STANDARD 14)
set (CMAKE_CXX_STANDARD 17)
Comment on lines 87 to +88
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot Feb 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

This comment is outdated. With the C++ standard updated to 17, this should be updated as well for consistency.

# Firebase C++ SDK requires C++17.
set (CMAKE_CXX_STANDARD 17)

set (CMAKE_CXX_STANDARD_REQUIRED YES) # Don't fall back to an earlier version.

# Download and unpack googletest (and googlemock) at configure time
Expand Down
2 changes: 1 addition & 1 deletion firestore/integration_test_internal/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ include_directories(${ABSEIL_CPP_ROOT})
add_definitions(-DINTERNAL_EXPERIMENTAL)

# Firebase C++ SDK requires C++14.
set (CMAKE_CXX_STANDARD 14)
set (CMAKE_CXX_STANDARD 17)
Comment on lines 238 to +239
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot Feb 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

This comment is outdated. With the C++ standard updated to 17, this should be updated as well for consistency.

# Firebase C++ SDK requires C++17.
set (CMAKE_CXX_STANDARD 17)

set (CMAKE_CXX_STANDARD_REQUIRED YES) # Don't fall back to an earlier version.

# Download and unpack googletest (and googlemock) at configure time
Expand Down
2 changes: 1 addition & 1 deletion functions/integration_test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ set(FIREBASE_INTEGRATION_TEST_SRCS
include_directories(src)

# Firebase C++ SDK requires C++14.
set (CMAKE_CXX_STANDARD 14)
set (CMAKE_CXX_STANDARD 17)
Comment on lines 87 to +88
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot Feb 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

This comment is outdated. With the C++ standard updated to 17, this should be updated as well for consistency.

# Firebase C++ SDK requires C++17.
set (CMAKE_CXX_STANDARD 17)

set (CMAKE_CXX_STANDARD_REQUIRED YES) # Don't fall back to an earlier version.

# Download and unpack googletest (and googlemock) at configure time
Expand Down
2 changes: 1 addition & 1 deletion installations/integration_test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ set(FIREBASE_INTEGRATION_TEST_SRCS
include_directories(src)

# Firebase C++ SDK requires C++14.
set (CMAKE_CXX_STANDARD 14)
set (CMAKE_CXX_STANDARD 17)
Comment on lines 87 to +88
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot Feb 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

This comment is outdated. With the C++ standard updated to 17, this should be updated as well for consistency.

# Firebase C++ SDK requires C++17.
set (CMAKE_CXX_STANDARD 17)

set (CMAKE_CXX_STANDARD_REQUIRED YES) # Don't fall back to an earlier version.

# Download and unpack googletest (and googlemock) at configure time
Expand Down
2 changes: 1 addition & 1 deletion messaging/integration_test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ set(FIREBASE_INTEGRATION_TEST_SRCS
include_directories(src)

# Firebase C++ SDK requires C++14.
set (CMAKE_CXX_STANDARD 14)
set (CMAKE_CXX_STANDARD 17)
Comment on lines 87 to +88
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot Feb 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

This comment is outdated. With the C++ standard updated to 17, this should be updated as well for consistency.

# Firebase C++ SDK requires C++17.
set (CMAKE_CXX_STANDARD 17)

set (CMAKE_CXX_STANDARD_REQUIRED YES) # Don't fall back to an earlier version.

# Download and unpack googletest (and googlemock) at configure time
Expand Down
2 changes: 1 addition & 1 deletion remote_config/integration_test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ set(FIREBASE_INTEGRATION_TEST_SRCS
include_directories(src)

# Firebase C++ SDK requires C++14.
set (CMAKE_CXX_STANDARD 14)
set (CMAKE_CXX_STANDARD 17)
Comment on lines 87 to +88
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot Feb 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

This comment is outdated. With the C++ standard updated to 17, this should be updated as well for consistency.

# Firebase C++ SDK requires C++17.
set (CMAKE_CXX_STANDARD 17)

set (CMAKE_CXX_STANDARD_REQUIRED YES) # Don't fall back to an earlier version.

# Download and unpack googletest (and googlemock) at configure time
Expand Down
2 changes: 1 addition & 1 deletion storage/integration_test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ set(FIREBASE_INTEGRATION_TEST_SRCS
include_directories(src)

# Firebase C++ SDK requires C++14.
set (CMAKE_CXX_STANDARD 14)
set (CMAKE_CXX_STANDARD 17)
Comment on lines 87 to +88
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot Feb 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

This comment is outdated. With the C++ standard updated to 17, this should be updated as well for consistency.

# Firebase C++ SDK requires C++17.
set (CMAKE_CXX_STANDARD 17)

set (CMAKE_CXX_STANDARD_REQUIRED YES) # Don't fall back to an earlier version.

# Download and unpack googletest (and googlemock) at configure time
Expand Down
2 changes: 1 addition & 1 deletion testing/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

cmake_minimum_required(VERSION 3.22)
set (CMAKE_CXX_STANDARD 14)
set (CMAKE_CXX_STANDARD 17)
set (CMAKE_CXX_STANDARD_REQUIRED YES) # Don't fall back to an earlier version.

include(binary_to_array)
Expand Down
2 changes: 1 addition & 1 deletion ump/integration_test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ set(FIREBASE_INTEGRATION_TEST_SRCS
include_directories(src)

# Firebase C++ SDK requires C++14.
set (CMAKE_CXX_STANDARD 14)
set (CMAKE_CXX_STANDARD 17)
Comment on lines 87 to +88
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot Feb 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

This comment is outdated. With the C++ standard updated to 17, this should be updated as well for consistency.

# Firebase C++ SDK requires C++17.
set (CMAKE_CXX_STANDARD 17)

set (CMAKE_CXX_STANDARD_REQUIRED YES) # Don't fall back to an earlier version.

# Download and unpack googletest (and googlemock) at configure time
Expand Down
Loading