Adding support for RedisJSON logger
Squashed commit of the following: commit dc3a1bf07b5e7afdfd45e56f34596300dab6fd70 Author: Ian Roddis <gitlab@ie2r.com> Date: Wed Oct 13 15:15:28 2021 -0300 Updating documentation a bit commit 8ec9c8c74f587368b32d034d3240a5537a69d4b1 Author: Ian Roddis <gitlab@ie2r.com> Date: Wed Oct 13 15:11:23 2021 -0300 Completing tests for redis commit a6308dfa35b40b5a147394af8e3322ada871eb92 Author: Ian Roddis <gitlab@ie2r.com> Date: Wed Oct 13 14:56:22 2021 -0300 Resolving some errors with forking environment commit 34691b6f85abae67001f4a4c234a4f7314407331 Author: Ian Roddis <gitlab@ie2r.com> Date: Wed Oct 13 10:53:55 2021 -0300 Checkpointing work on unit tests commit 44c2b50fde30348938d901703ead9e279c3cd237 Author: Ian Roddis <gitlab@ie2r.com> Date: Wed Oct 13 09:09:58 2021 -0300 Checkpointing work on redis commit a8051b725257087e25bc452673633ba6b40e3985 Author: Ian Roddis <gitlab@ie2r.com> Date: Fri Oct 8 13:31:41 2021 -0300 Checkpointing progress, changing state updates to a single record type commit 456b84ad8c7dee0ff0dd39d5a7caead1ccd1126c Author: Ian Roddis <gitlab@ie2r.com> Date: Thu Oct 7 16:43:48 2021 -0300 Checkpointing progress commit f19dcaa4e417c3f2f6e527c288fe51401c9fe1d7 Author: Ian Roddis <gitlab@ie2r.com> Date: Thu Oct 7 11:53:35 2021 -0300 Moving back to hiredis to avoid boost dependency commit e4bea6c589e82c82fd41476f164d946d77677193 Author: Ian Roddis <gitlab@ie2r.com> Date: Wed Oct 6 10:41:16 2021 -0300 fixing comments commit 807a73c2a406817001eec048483938545a60194c Author: Ian Roddis <gitlab@ie2r.com> Date: Wed Oct 6 10:40:38 2021 -0300 Switching to redis-cpp commit d060c008d4d96bf3a81a19d35067f95f3638b8ca Author: Ian Roddis <gitlab@ie2r.com> Date: Tue Oct 5 17:54:06 2021 -0300 Adding hiredis dep
This commit is contained in:
@@ -12,4 +12,4 @@ ExternalProject_Add(${PROJECT_NAME}-external
|
||||
CONFIGURE_COMMAND "")
|
||||
add_library(${PROJECT_NAME} INTERFACE)
|
||||
add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}-external)
|
||||
target_include_directories(${PROJECT_NAME} SYSTEM INTERFACE ${THIRD_PARTY_DIR}/${PROJECT_NAME}/include)
|
||||
target_include_directories(${PROJECT_NAME} SYSTEM INTERFACE ${THIRD_PARTY_DIR}/${PROJECT_NAME}/include)
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# SLURM
|
||||
message("-- DAGGY_ENABLED_SLURM is set to ${DAGGY_ENABLE_SLURM}")
|
||||
# Slurm support
|
||||
message("-- DAGGY_ENABLE_SLURM is set to ${DAGGY_ENABLE_SLURM}")
|
||||
if (DAGGY_ENABLE_SLURM)
|
||||
find_library(SLURM_LIB libslurm.so libslurm.a slurm REQUIRED)
|
||||
find_path(SLURM_INCLUDE_DIR "slurm/slurm.h" REQUIRED)
|
||||
@@ -16,3 +16,10 @@ if (DAGGY_ENABLE_SLURM)
|
||||
target_compile_definitions(slurm INTERFACE DAGGY_ENABLE_SLURM)
|
||||
target_link_libraries(slurm INTERFACE dl resolv)
|
||||
endif ()
|
||||
|
||||
# Redis support
|
||||
message("-- DAGGY_ENABLE_REDIS is set to ${DAGGY_ENABLE_SLURM}")
|
||||
if (DAGGY_ENABLE_REDIS)
|
||||
include(cmake/hiredis.cmake)
|
||||
target_compile_definitions(slurm INTERFACE DAGGY_ENABLE_REDIS)
|
||||
endif ()
|
||||
|
||||
23
cmake/hiredis.cmake
Normal file
23
cmake/hiredis.cmake
Normal file
@@ -0,0 +1,23 @@
|
||||
project(hiredis)
|
||||
|
||||
include(ExternalProject)
|
||||
|
||||
set_directory_properties(PROPERTIES EP_UPDATE_DISCONNECTED true)
|
||||
|
||||
ExternalProject_Add(hiredisDownload
|
||||
PREFIX ${hiredis_root}
|
||||
GIT_REPOSITORY https://github.com/redis/hiredis.git
|
||||
GIT_TAG "v1.0.1"
|
||||
CONFIGURE_COMMAND ""
|
||||
BUILD_IN_SOURCE ON
|
||||
INSTALL_COMMAND ""
|
||||
)
|
||||
|
||||
ExternalProject_Get_Property(hiredisDownload SOURCE_DIR)
|
||||
set(HIREDIS_INCLUDE_DIR ${SOURCE_DIR})
|
||||
set(HIREDIS_LIB_DIR ${SOURCE_DIR})
|
||||
|
||||
add_library(${PROJECT_NAME} SHARED IMPORTED)
|
||||
add_dependencies(${PROJECT_NAME} hiredisDownload)
|
||||
target_include_directories(${PROJECT_NAME} INTERFACE ${HIREDIS_INCLUDE_DIR})
|
||||
set_target_properties(${PROJECT_NAME} PROPERTIES IMPORTED_LOCATION "${HIREDIS_LIB_DIR}/libhiredis.a")
|
||||
Reference in New Issue
Block a user