Page MenuHomePhabricator

D4625.id14884.diff
No OneTemporary

D4625.id14884.diff

diff --git a/services/blob/CMakeLists.txt b/services/blob/CMakeLists.txt
--- a/services/blob/CMakeLists.txt
+++ b/services/blob/CMakeLists.txt
@@ -15,7 +15,6 @@
set(WITH_GTEST "Use Google Test" OFF)
# FIND LIBS
-include(./cmake-components/grpc.cmake)
include(./cmake-components/folly.cmake)
find_package(AWSSDK REQUIRED COMPONENTS s3 core dynamodb)
find_package(Boost 1.40 COMPONENTS program_options REQUIRED)
@@ -26,7 +25,13 @@
GIT_REPOSITORY https://github.com/google/glog.git
GIT_TAG 96a2f23dca4cc7180821ca5f32e526314395d26a # v0.4.0
)
-FetchContent_MakeAvailable(glog)
+FetchContent_Declare(
+ gRPC
+ GIT_REPOSITORY https://github.com/grpc/grpc.git
+ GIT_TAG 2d6b8f61cfdd1c4d2d7c1aae65a4fbf00e3e0981 # v1.39.1
+)
+
+FetchContent_MakeAvailable(glog gRPC)
# FIND FILES
file(GLOB DOUBLE_CONVERSION_SOURCES
@@ -64,11 +69,11 @@
set(
LIBS
- ${GRPC_LIBS}
${AWSSDK_LINK_LIBRARIES}
${Boost_LIBRARIES}
OpenSSL::SSL
glog
+ grpc++
)
target_link_libraries(

File Metadata

Mime Type
text/plain
Expires
Thu, Dec 26, 7:28 PM (9 h, 36 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2708261
Default Alt Text
D4625.id14884.diff (994 B)

Event Timeline