Skip to content

Commit 45dd8f9

Browse files
committed
Merge pull request #5 from redbadger/redis-backend
Update the redis backend
2 parents af2993b + 3f72f8c commit 45dd8f9

File tree

3 files changed

+522
-123
lines changed

3 files changed

+522
-123
lines changed

CMake/FindLibgit2.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
# use pkg-config to get the directories and then use these values
1111
# in the FIND_PATH() and FIND_LIBRARY() calls
12-
FIND_PACKAGE(PkgConfig)
13-
PKG_SEARCH_MODULE(PC_LIBGIT2 libgit2)
12+
#FIND_PACKAGE(PkgConfig)
13+
#PKG_SEARCH_MODULE(PC_LIBGIT2 libgit2)
1414

1515
SET(LIBGIT2_DEFINITIONS ${PC_LIBGIT2_CFLAGS_OTHER})
1616

redis/CMakeLists.txt

+8-2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ IF (NOT CMAKE_BUILD_TYPE)
1414
ENDIF ()
1515

1616
# Compile and link libgit2
17-
INCLUDE_DIRECTORIES(${LIBGIT2_INCLUDE_DIRS} ${LIBHIREDIS_INCLUDE_DIRS})
18-
ADD_LIBRARY(git2-redis hiredis.c)
17+
INCLUDE_DIRECTORIES(${LIBGIT2_INCLUDE_DIR} ${LIBHIREDIS_INCLUDE_DIR})
18+
19+
IF (BUILD_SHARED_LIBS)
20+
ADD_LIBRARY(git2-redis SHARED hiredis.c)
21+
ELSE ()
22+
ADD_LIBRARY(git2-redis STATIC hiredis.c)
23+
ENDIF ()
24+
1925
TARGET_LINK_LIBRARIES(git2-redis ${LIBGIT2_LIBRARIES} ${LIBHIREDIS_LIBRARIES})

0 commit comments

Comments
 (0)