Commit 7a689719 by Vicent Marti

Merge branch 'master' of https://github.com/saschpe/libgit2 into saschpe-master

Conflicts:
	CMakeLists.txt
parents f443a879 2d5ef6ad
...@@ -80,6 +80,7 @@ ENDIF () ...@@ -80,6 +80,7 @@ ENDIF ()
# Compile and link libgit2 # Compile and link libgit2
ADD_LIBRARY(git2 ${SRC} ${SRC_PLAT} ${SRC_SHA1}) ADD_LIBRARY(git2 ${SRC} ${SRC_PLAT} ${SRC_SHA1})
TARGET_LINK_LIBRARIES(git2 ${ZLIB_LIBRARY} ${LIB_SHA1} ${PTHREAD_LIBRARY} ${SQLITE3_LIBRARIES}) TARGET_LINK_LIBRARIES(git2 ${ZLIB_LIBRARY} ${LIB_SHA1} ${PTHREAD_LIBRARY} ${SQLITE3_LIBRARIES})
SET_TARGET_PROPERTIES(git2 PROPERTIES VERSION 0.0.1 SOVERSION 0)
# Install # Install
INSTALL(TARGETS git2 INSTALL(TARGETS git2
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment