Skip to content

Commit f24017f

Browse files
AustinBenoitAustinBenoit
authored
Merge ab54ef1 into d482fe8 
2 parents d482fe8 + ab54ef1 commit f24017f

17 files changed

Lines changed: 106 additions & 17 deletions

File tree

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
cmake_minimum_required(VERSION 3.22)
1818

19-
set (CMAKE_CXX_STANDARD 14)
19+
set (CMAKE_CXX_STANDARD 17)
2020
set (CMAKE_CXX_STANDARD_REQUIRED YES) # Don't fall back to an earlier version.
2121

2222
# Turn on virtual folders for visual studio

‎analytics/integration_test/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ set(FIREBASE_INTEGRATION_TEST_SRCS
8585
include_directories(src)
8686

8787
# Firebase C++ SDK requires C++14.
88-
set (CMAKE_CXX_STANDARD 14)
88+
set (CMAKE_CXX_STANDARD 17)
8989
set (CMAKE_CXX_STANDARD_REQUIRED YES) # Don't fall back to an earlier version.
9090

9191
# Download and unpack googletest (and googlemock) at configure time

‎app/integration_test/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ set(FIREBASE_INTEGRATION_TEST_SRCS
8585
include_directories(src)
8686

8787
# Firebase C++ SDK requires C++14.
88-
set (CMAKE_CXX_STANDARD 14)
88+
set (CMAKE_CXX_STANDARD 17)
8989
set (CMAKE_CXX_STANDARD_REQUIRED YES) # Don't fall back to an earlier version.
9090

9191
# Download and unpack googletest (and googlemock) at configure time

‎app/rest/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
cmake_minimum_required(VERSION 3.22)
1818
# Firebase C++ SDK requires C++14.
19-
set (CMAKE_CXX_STANDARD 14)
19+
set (CMAKE_CXX_STANDARD 17)
2020
set (CMAKE_CXX_STANDARD_REQUIRED YES) # Don't fall back to an earlier version.
2121

2222
project(firebase_rest_lib NONE)

‎app_check/integration_test/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ set(FIREBASE_INTEGRATION_TEST_SRCS
8585
include_directories(src)
8686

8787
# Firebase C++ SDK requires C++14.
88-
set (CMAKE_CXX_STANDARD 14)
88+
set (CMAKE_CXX_STANDARD 17)
8989
set (CMAKE_CXX_STANDARD_REQUIRED YES) # Don't fall back to an earlier version.
9090

9191
# Download and unpack googletest (and googlemock) at configure time

‎auth/integration_test/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ set(FIREBASE_INTEGRATION_TEST_SRCS
8585
include_directories(src)
8686

8787
# Firebase C++ SDK requires C++14.
88-
set (CMAKE_CXX_STANDARD 14)
88+
set (CMAKE_CXX_STANDARD 17)
8989
set (CMAKE_CXX_STANDARD_REQUIRED YES) # Don't fall back to an earlier version.
9090

9191
# Download and unpack googletest (and googlemock) at configure time

‎cmake/external/firestore.patch.txt‎

Lines changed: 90 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,39 @@
1+
---
2+
cmake/external/grpc.cmake | 4 ++--
3+
1 file changed, 2 insertions(+), 2 deletions(-)
4+
5+
diff --git a/cmake/external/grpc.cmake b/cmake/external/grpc.cmake
6+
index 21d970a8d..cc7a038a5 100644
7+
--- a/cmake/external/grpc.cmake
8+
+++ b/cmake/external/grpc.cmake
9+
@@ -18,7 +18,7 @@ if(TARGET grpc)
10+
return()
11+
endif()
12+
13+
-set(version 1.62.0)
14+
+set(version 1.69.0)
15+
16+
ExternalProject_Add(
17+
grpc
18+
@@ -26,7 +26,7 @@ ExternalProject_Add(
19+
DOWNLOAD_DIR ${FIREBASE_DOWNLOAD_DIR}
20+
DOWNLOAD_NAME grpc-${version}.tar.gz
21+
URL https://github.com/grpc/grpc/archive/v${version}.tar.gz
22+
- URL_HASH SHA256=f40bde4ce2f31760f65dc49a2f50876f59077026494e67dccf23992548b1b04f
23+
+ URL_HASH SHA256=cd256d91781911d46a57506978b3979bfee45d5086a1b6668a3ae19c5e77f8dc
24+
25+
PREFIX ${PROJECT_BINARY_DIR}
26+
SOURCE_DIR ${PROJECT_BINARY_DIR}/src/grpc
27+
--
28+
2.51.0.710.ga91ca5db03-goog
29+
30+
31+
---
32+
cmake/external/leveldb.cmake | 5 ++++-
33+
1 file changed, 4 insertions(+), 1 deletion(-)
34+
135
diff --git a/cmake/external/leveldb.cmake b/cmake/external/leveldb.cmake
2-
index 920bf2928..c5c9cc7ee 100644
36+
index 81ed8e6f1..32f1993c0 100644
337
--- a/cmake/external/leveldb.cmake
438
+++ b/cmake/external/leveldb.cmake
539
@@ -24,7 +24,10 @@ if(TARGET leveldb)
@@ -14,3 +48,58 @@ index 920bf2928..c5c9cc7ee 100644
1448

1549
ExternalProject_Get_property(snappy SOURCE_DIR)
1650
set(snappy_source_dir "${SOURCE_DIR}")
51+
--
52+
2.51.0.710.ga91ca5db03-goog
53+
54+
55+
---
56+
Firestore/core/CMakeLists.txt | 9 +++++++++
57+
1 file changed, 9 insertions(+)
58+
59+
diff --git a/Firestore/core/CMakeLists.txt b/Firestore/core/CMakeLists.txt
60+
index cb4050748..90cd4af47 100644
61+
--- a/Firestore/core/CMakeLists.txt
62+
+++ b/Firestore/core/CMakeLists.txt
63+
@@ -245,6 +245,15 @@ target_include_directories(
64+
${PROJECT_SOURCE_DIR}/Firestore/core/include
65+
)
66+
67+
+# Add the gRPC include directories as SYSTEM directories to silence warnings
68+
+target_include_directories(
69+
+ firestore_core
70+
+ SYSTEM # The SYSTEM keyword applies to all directories in this block
71+
+ PUBLIC
72+
+ # This generator expression automatically gets the correct include path(s) from the grpc++ target
73+
+ $<TARGET_PROPERTY:grpc++,INTERFACE_INCLUDE_DIRECTORIES>
74+
+)
75+
+
76+
target_link_libraries(
77+
firestore_core PUBLIC
78+
LevelDB::LevelDB
79+
--
80+
2.51.0.710.ga91ca5db03-goog
81+
82+
83+
---
84+
cmake/compiler_setup.cmake | 6 +++---
85+
1 file changed, 3 insertions(+), 3 deletions(-)
86+
87+
diff --git a/cmake/compiler_setup.cmake b/cmake/compiler_setup.cmake
88+
index 00e96033..0bfa1e40 100644
89+
--- a/cmake/compiler_setup.cmake
90+
+++ b/cmake/compiler_setup.cmake
91+
@@ -17,9 +17,9 @@ include(CheckCXXCompilerFlag)
92+
# C++ Compiler setup
93+
94+
# We use C++14
95+
-set(CMAKE_CXX_STANDARD 14)
96+
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
97+
-set(CMAKE_CXX_EXTENSIONS OFF)
98+
+# set(CMAKE_CXX_STANDARD 14)
99+
+# set(CMAKE_CXX_STANDARD_REQUIRED ON)
100+
+# set(CMAKE_CXX_EXTENSIONS OFF)
101+
102+
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
103+
set(CXX_CLANG ON)
104+
--
105+
2.51.0.710.ga91ca5db03-goog

‎database/integration_test/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ set(FIREBASE_INTEGRATION_TEST_SRCS
8585
include_directories(src)
8686

8787
# Firebase C++ SDK requires C++14.
88-
set (CMAKE_CXX_STANDARD 14)
88+
set (CMAKE_CXX_STANDARD 17)
8989
set (CMAKE_CXX_STANDARD_REQUIRED YES) # Don't fall back to an earlier version.
9090

9191
# Download and unpack googletest (and googlemock) at configure time

‎firestore/integration_test/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ set(FIREBASE_INTEGRATION_TEST_SRCS
8585
include_directories(src)
8686

8787
# Firebase C++ SDK requires C++14.
88-
set (CMAKE_CXX_STANDARD 14)
88+
set (CMAKE_CXX_STANDARD 17)
8989
set (CMAKE_CXX_STANDARD_REQUIRED YES) # Don't fall back to an earlier version.
9090

9191
# Download and unpack googletest (and googlemock) at configure time

‎firestore/integration_test_internal/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ include_directories(${ABSEIL_CPP_ROOT})
236236
add_definitions(-DINTERNAL_EXPERIMENTAL)
237237

238238
# Firebase C++ SDK requires C++14.
239-
set (CMAKE_CXX_STANDARD 14)
239+
set (CMAKE_CXX_STANDARD 17)
240240
set (CMAKE_CXX_STANDARD_REQUIRED YES) # Don't fall back to an earlier version.
241241

242242
# Download and unpack googletest (and googlemock) at configure time

0 commit comments

Comments
 (0)