Skip to content

Redis updates WIP #1

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

Closed
charypar wants to merge 10 commits into from
Closed

Redis updates WIP #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
98b9519
Add static build support to redis
charypar Feb 24, 2014
5b95ee8
Update to work with current libgit2, prefix keys to support multiple …
charypar Feb 24, 2014
4dfd5d2
Enable linking to local libgit2
charypar Feb 24, 2014
40e899c
Unified whitespace
charypar Feb 24, 2014
ca09ac5
Basic operations for redis refdb backend
charypar Feb 25, 2014
722b5c5
Added ref iteration support
charypar Feb 26, 2014
d1923d2
Proper freeing of refdb backend
charypar Feb 26, 2014
b1014a7
Remove debug prints and disable reflog properly
charypar Feb 26, 2014
177e727
Made key prefix dynamic
charypar Feb 26, 2014
f6b47d3
Added more descriptive errors
charypar Feb 26, 2014
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
24 changes: 20 additions & 4 deletions redis/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,21 @@
PROJECT(libgit2-redis C)
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)

INCLUDE(../CMake/FindLibgit2.cmake)
INCLUDE(../CMake/FindHiredis.cmake)

# Build options
OPTION (BUILD_SHARED_LIBS "Build Shared Library (OFF for Static)" ON)
OPTION (BUILD_TESTS "Build Tests" ON)
SET (PC_LIBGIT2_LIBRARY_DIRS "" CACHE STRING "libgit2 path")
SET (PC_LIBGIT2_INCLUDE_DIRS "" CACHE STRING "libgit2 include directories")

INCLUDE(../CMake/FindHiredis.cmake)

# Allow overriding to local libgit2. I'm pretty sure I'm doing this wrong.
IF (${PC_LIBGIT2_INCLUDE_DIRS} STREQUAL "")
INCLUDE(../CMake/FindLibgit2.cmake)
ELSE ()
SET (LIBGIT2_LIBRARIES ${PC_LIBGIT2_LIBRARY_DIRS})
SET (LIBGIT2_INCLUDE_DIRS ${PC_LIBGIT2_INCLUDE_DIRS})
ENDIF ()

# Build Release by default
IF (NOT CMAKE_BUILD_TYPE)
Expand All @@ -15,5 +24,12 @@ ENDIF ()

# Compile and link libgit2
INCLUDE_DIRECTORIES(${LIBGIT2_INCLUDE_DIRS} ${LIBHIREDIS_INCLUDE_DIRS})
ADD_LIBRARY(git2-redis hiredis.c)

ADD_LIBRARY(core OBJECT hiredis.c)
IF (BUILD_SHARED_LIBS)
ADD_LIBRARY(git2-redis SHARED $<TARGET_OBJECTS:core>)
ELSE ()
ADD_LIBRARY(git2-redis STATIC $<TARGET_OBJECTS:core>)
ENDIF ()

TARGET_LINK_LIBRARIES(git2-redis ${LIBGIT2_LIBRARIES} ${LIBHIREDIS_LIBRARIES})
Loading