Skip to content
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

Jump to bottom

Bundle grpc/protobuf in tiflash #3896

Merged
merged 28 commits into from
Jan 21, 2022
Merged

Bundle grpc/protobuf in tiflash #3896

Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
9d354a8
Update pingcap submodules
zanmato1984 Jan 19, 2022
ec2a242
Add changes that definitely will be useful
zanmato1984 Jan 19, 2022
017511f
Add other things
zanmato1984 Jan 19, 2022
2e4dcae
Move abseil-cpp
zanmato1984 Jan 19, 2022
20a1b87
Refine modules
zanmato1984 Jan 19, 2022
403f280
Refine modules
zanmato1984 Jan 19, 2022
5a6d71f
Add abseil-cpp
zanmato1984 Jan 19, 2022
fb66b38
Merge branch 'master' into bundle-grpc
zanmato1984 Jan 19, 2022
1415707
format
zanmato1984 Jan 19, 2022
89ae01d
Format
zanmato1984 Jan 19, 2022
cef3a09
Remove comments
zanmato1984 Jan 19, 2022
316d9d7
Add finding local grpc
zanmato1984 Jan 19, 2022
c161dba
Remove copy libnsl
zanmato1984 Jan 19, 2022
69cde05
Update .gitmodules
zanmato1984 Jan 19, 2022
37cf0c0
Fix cctz missing core foundation on mac
zanmato1984 Jan 19, 2022
665166f
Merge branch 'bundle-grpc' into bundle-grpc-next
zanmato1984 Jan 19, 2022
614067a
Merge branch 'bundle-grpc-next' into bundle-grpc
zanmato1984 Jan 19, 2022
82d7743
Add lib grp in finding local grpc
zanmato1984 Jan 19, 2022
13dfd01
Add PREBUILD_LIBS_ROOT cmake variable
JaySon-Huang Jan 20, 2022
8550983
Update contrib/CMakeLists.txt
zanmato1984 Jan 20, 2022
6cec56e
Address comment
JaySon-Huang Jan 20, 2022
33a6869
Merge pull request #4 from JaySon-Huang/bundle-grpc
zanmato1984 Jan 20, 2022
16d044a
Merge branch 'master' into bundle-grpc
zanmato1984 Jan 20, 2022
ecb7160
Merge branch 'master' into bundle-grpc
zanmato1984 Jan 20, 2022
9016536
Fix grpc lib order to support static libs
zanmato1984 Jan 21, 2022
b9aacbf
Addjust grpc dependency order
zanmato1984 Jan 21, 2022
571a628
Merge branch 'master' into bundle-grpc
zanmato1984 Jan 21, 2022
a5853d4
Merge branch 'bundle-grpc' of https://github.com/zanmato1984/tics int…
zanmato1984 Jan 21, 2022
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
11 changes: 11 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,3 +65,14 @@
[submodule "contrib/benchmark"]
path = contrib/benchmark
url = https://github.com/google/benchmark
[submodule "contrib/protobuf"]
path = contrib/protobuf
url = https://github.com/protocolbuffers/protobuf
branch = v3.8.0
[submodule "contrib/abseil-cpp"]
path = contrib/abseil-cpp
url = https://github.com/abseil/abseil-cpp
zanmato1984 marked this conversation as resolved.
Show resolved Hide resolved
[submodule "contrib/grpc"]
path = contrib/grpc
url = https://github.com/grpc/grpc
branch = v1.26.0
6 changes: 6 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,11 @@ if (UNBUNDLED OR NOT (ARCH_LINUX OR APPLE) OR ARCH_32)
option (NO_WERROR "Disable -Werror compiler option" ON)
endif ()

if (PREBUILT_LIBS_ROOT)
list(PREPEND CMAKE_SYSTEM_PREFIX_PATH ${PREBUILT_LIBS_ROOT})
message(STATUS "Add ${PREBUILT_LIBS_ROOT} to cmake search path for pre-built libraries")
endif()

message (STATUS "Building for: ${CMAKE_SYSTEM} ${CMAKE_SYSTEM_PROCESSOR} ${CMAKE_LIBRARY_ARCHITECTURE} ; USE_STATIC_LIBRARIES=${USE_STATIC_LIBRARIES} MAKE_STATIC_LIBRARIES=${MAKE_STATIC_LIBRARIES} UNBUNDLED=${UNBUNDLED}")

include(GNUInstallDirs)
Expand Down Expand Up @@ -318,6 +323,7 @@ include (cmake/find_execinfo.cmake)
include (cmake/find_readline_edit.cmake)
include (cmake/find_re2.cmake)
include (cmake/find_llvm.cmake)
include (cmake/find_protobuf.cmake)
include (cmake/find_grpc.cmake)
include (cmake/find_kvproto.cmake)
include (cmake/find_tipb.cmake)
Expand Down
Loading