You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
30 lines
1.1 KiB
30 lines
1.1 KiB
12 years ago
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||
11 years ago
|
index 6642290..70b013e 100644
|
||
|
12 years ago
|
--- a/CMakeLists.txt
|
||
|
|
+++ b/CMakeLists.txt
|
||
|
11 years ago
|
@@ -338,7 +338,7 @@ ELSEIF (AMIGA)
|
||
|
12 years ago
|
ELSE()
|
||
|
11 years ago
|
FILE(GLOB SRC_OS src/unix/*.c src/unix/*.h)
|
||
|
12 years ago
|
ENDIF()
|
||
|
11 years ago
|
-FILE(GLOB SRC_GIT2 src/*.c src/*.h src/transports/*.c src/transports/*.h src/xdiff/*.c src/xdiff/*.h)
|
||
|
|
+FILE(GLOB SRC_GIT2 src/*.c src/*.h src/transports/*.c src/transports/*.h)
|
||
|
12 years ago
|
|
||
|
|
# Determine architecture of the machine
|
||
|
|
IF (CMAKE_SIZEOF_VOID_P EQUAL 8)
|
||
|
11 years ago
|
@@ -353,6 +353,7 @@ ENDIF()
|
||
|
|
ADD_LIBRARY(git2 ${SRC_H} ${SRC_GIT2} ${SRC_OS} ${SRC_ZLIB} ${SRC_HTTP} ${SRC_REGEX} ${SRC_SHA1} ${WIN_RC})
|
||
|
12 years ago
|
TARGET_LINK_LIBRARIES(git2 ${SSL_LIBRARIES})
|
||
|
|
TARGET_LINK_LIBRARIES(git2 ${SSH_LIBRARIES})
|
||
|
|
+TARGET_LINK_LIBRARIES(git2 -lxdiff)
|
||
|
|
TARGET_OS_LIBRARIES(git2)
|
||
|
|
|
||
|
|
# Workaround for Cmake bug #0011240 (see http://public.kitware.com/Bug/view.php?id=11240)
|
||
|
11 years ago
|
@@ -418,6 +419,7 @@ IF (BUILD_CLAR)
|
||
|
12 years ago
|
|
||
|
|
TARGET_LINK_LIBRARIES(libgit2_clar ${SSL_LIBRARIES})
|
||
|
|
TARGET_LINK_LIBRARIES(libgit2_clar ${SSH_LIBRARIES})
|
||
|
|
+ TARGET_LINK_LIBRARIES(libgit2_clar -lxdiff)
|
||
|
|
TARGET_OS_LIBRARIES(libgit2_clar)
|
||
|
|
MSVC_SPLIT_SOURCES(libgit2_clar)
|
||
|
|
|