Page MenuHomePhabricator

D4624.diff
No OneTemporary

D4624.diff

diff --git a/services/blob/CMakeLists.txt b/services/blob/CMakeLists.txt
--- a/services/blob/CMakeLists.txt
+++ b/services/blob/CMakeLists.txt
@@ -1,6 +1,7 @@
PROJECT(blob C CXX)
cmake_minimum_required(VERSION 3.16)
+include(FetchContent)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY bin)
@@ -16,11 +17,17 @@
# FIND LIBS
include(./cmake-components/grpc.cmake)
include(./cmake-components/folly.cmake)
-add_subdirectory(./lib/glog)
find_package(AWSSDK REQUIRED COMPONENTS s3 core dynamodb)
find_package(Boost 1.40 COMPONENTS program_options REQUIRED)
find_package(OpenSSL REQUIRED)
+FetchContent_Declare(
+ glog
+ GIT_REPOSITORY https://github.com/google/glog.git
+ GIT_TAG 96a2f23dca4cc7180821ca5f32e526314395d26a # v0.4.0
+)
+FetchContent_MakeAvailable(glog)
+
# FIND FILES
file(GLOB DOUBLE_CONVERSION_SOURCES
"./lib/double-conversion/double-conversion/*.cc"
@@ -61,7 +68,7 @@
${AWSSDK_LINK_LIBRARIES}
${Boost_LIBRARIES}
OpenSSL::SSL
- glog::glog
+ glog
)
target_link_libraries(

File Metadata

Mime Type
text/plain
Expires
Wed, Dec 25, 9:13 PM (12 h, 31 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2703186
Default Alt Text
D4624.diff (1010 B)

Event Timeline