Commit 6b9cc0290f8310c5ea43351077476e9601c29783

Patrick Steinhardt 2019-05-21T12:05:50

Merge pull request #5080 from dbrnz/issue-5079 We've already added `ZLIB_LIBRARIES` to `LIBGIT2_LIBS` so don't also add the `z` library

1
2
3
4
5
6
7
8
9
10
11
12
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7a1898f..00021b8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -328,7 +328,6 @@ IF(NOT USE_BUNDLED_ZLIB)
 		LIST(APPEND LIBGIT2_SYSTEM_INCLUDES ${ZLIB_INCLUDE_DIRS})
 		LIST(APPEND LIBGIT2_LIBS ${ZLIB_LIBRARIES})
 		IF(APPLE OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
-			LIST(APPEND LIBGIT2_LIBS "z")
 			LIST(APPEND LIBGIT2_PC_LIBS "-lz")
 		ELSE()
 			LIST(APPEND LIBGIT2_PC_REQUIRES "zlib")