diff options
Diffstat (limited to 'main/libgit2/build-both-static-dynamic.patch')
| -rw-r--r-- | main/libgit2/build-both-static-dynamic.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/main/libgit2/build-both-static-dynamic.patch b/main/libgit2/build-both-static-dynamic.patch index eeb179a1e0..9c85dc56b4 100644 --- a/main/libgit2/build-both-static-dynamic.patch +++ b/main/libgit2/build-both-static-dynamic.patch @@ -13,7 +13,7 @@ This is very hack-ish, it makes option BUILD_SHARED_LIBS unusable. OPTION( THREADSAFE "Build libgit2 as threadsafe" ON ) OPTION( BUILD_CLAR "Build Tests using the Clar suite" ON ) OPTION( BUILD_EXAMPLES "Build library usage example apps" OFF ) -@@ -44,6 +43,8 @@ +@@ -45,6 +44,8 @@ OPTION( CURL "Use curl for HTTP if available" ON) OPTION( DEBUG_POOL "Enable debug pool allocator" OFF ) @@ -22,7 +22,7 @@ This is very hack-ish, it makes option BUILD_SHARED_LIBS unusable. IF(DEBUG_POOL) ADD_DEFINITIONS(-DGIT_DEBUG_POOL) ENDIF() -@@ -602,7 +603,8 @@ +@@ -609,7 +610,8 @@ ENDIF() # Compile and link libgit2 @@ -32,7 +32,7 @@ This is very hack-ish, it makes option BUILD_SHARED_LIBS unusable. TARGET_LINK_LIBRARIES(git2 ${SECURITY_DIRS}) TARGET_LINK_LIBRARIES(git2 ${COREFOUNDATION_DIRS}) TARGET_LINK_LIBRARIES(git2 ${SSL_LIBRARIES}) -@@ -611,6 +613,9 @@ +@@ -618,6 +620,9 @@ TARGET_LINK_LIBRARIES(git2 ${ICONV_LIBRARIES}) TARGET_OS_LIBRARIES(git2) @@ -42,7 +42,7 @@ This is very hack-ish, it makes option BUILD_SHARED_LIBS unusable. # Workaround for Cmake bug #0011240 (see http://public.kitware.com/Bug/view.php?id=11240) # Win64+MSVC+static libs = linker error IF(MSVC AND GIT_ARCH_64 AND NOT BUILD_SHARED_LIBS) -@@ -639,7 +644,7 @@ +@@ -646,7 +651,7 @@ ENDIF () # Install |