File tree Expand file tree Collapse file tree 5 files changed +30
-405
lines changed Expand file tree Collapse file tree 5 files changed +30
-405
lines changed Original file line number Diff line number Diff line change @@ -18,14 +18,6 @@ if(TARGET firestore)
18
18
return ()
19
19
endif ()
20
20
21
- if (${CMAKE_VERSION} VERSION_LESS "3.12" )
22
- include (FindPythonInterp )
23
- set (MY_PYTHON_EXECUTABLE "${PYTHON_EXECUTABLE} " )
24
- else ()
25
- find_package (Python3 COMPONENTS Interpreter REQUIRED )
26
- set (MY_PYTHON_EXECUTABLE "${Python3_EXECUTABLE} " )
27
- endif ()
28
-
29
21
# If the format of the line below changes, then be sure to update
30
22
# https://github.com/firebase/firebase-cpp-sdk/blob/fd054fa016/.github/workflows/update-dependencies.yml#L81
31
23
set (version CocoaPods-9.1.0 )
@@ -46,11 +38,7 @@ function(GetReleasedDep)
46
38
BUILD_COMMAND ""
47
39
INSTALL_COMMAND ""
48
40
TEST_COMMAND ""
49
- PATCH_COMMAND
50
- ${MY_PYTHON_EXECUTABLE}
51
- ${CMAKE_CURRENT_LIST_DIR} /firestore_patch.py
52
- --leveldb-version-from
53
- ${CMAKE_CURRENT_LIST_DIR} /leveldb.cmake
41
+ PATCH_COMMAND patch -Np1 -i ${CMAKE_CURRENT_LIST_DIR} /firestore.patch.txt
54
42
HTTP_HEADER "${EXTERNAL_PROJECT_HTTP_HEADER} "
55
43
)
56
44
endfunction ()
@@ -71,11 +59,7 @@ function(GetTag t)
71
59
BUILD_COMMAND ""
72
60
INSTALL_COMMAND ""
73
61
TEST_COMMAND ""
74
- PATCH_COMMAND
75
- ${MY_PYTHON_EXECUTABLE}
76
- ${CMAKE_CURRENT_LIST_DIR} /firestore_patch.py
77
- --leveldb-version-from
78
- ${CMAKE_CURRENT_LIST_DIR} /leveldb.cmake
62
+ PATCH_COMMAND patch -Np1 -i ${CMAKE_CURRENT_LIST_DIR} /firestore.patch.txt
79
63
HTTP_HEADER "${EXTERNAL_PROJECT_HTTP_HEADER} "
80
64
)
81
65
endfunction ()
Original file line number Diff line number Diff line change
1
+ diff --git a/cmake/external/leveldb.cmake b/cmake/external/leveldb.cmake
2
+ index 920bf2928..c5c9cc7ee 100644
3
+ --- a/cmake/external/leveldb.cmake
4
+ +++ b/cmake/external/leveldb.cmake
5
+ @@ -24,7 +24,10 @@ if(TARGET leveldb)
6
+ return()
7
+ endif()
8
+
9
+ -set(version 1.22)
10
+ +# This version must be kept in sync with cmake/external/leveldb.cmake
11
+ +# in the firebase-cpp-sdk. If this version ever changes then make sure
12
+ +# to update leveldb.cmake in the firebase-cpp-sdk accordingly.
13
+ +set(version 1.23)
14
+
15
+ ExternalProject_Get_property(snappy SOURCE_DIR)
16
+ set(snappy_source_dir "${SOURCE_DIR}")
17
+ @@ -39,7 +42,7 @@ ExternalProject_Add(
18
+ DOWNLOAD_DIR ${FIREBASE_DOWNLOAD_DIR}
19
+ DOWNLOAD_NAME leveldb-${version}.tar.gz
20
+ URL https://github.com/google/leveldb/archive/${version}.tar.gz
21
+ - URL_HASH SHA256=55423cac9e3306f4a9502c738a001e4a339d1a38ffbee7572d4a07d5d63949b2
22
+ + URL_HASH SHA256=9a37f8a6174f09bd622bc723b55881dc541cd50747cbd08831c2a82d620f6d76
23
+
24
+ PREFIX ${PROJECT_BINARY_DIR}
25
+
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments