Commit 06dbf7340767b8af71591c568f4d87f646a254e8

David Brooks 2019-05-21T15:44:32

We've already added `ZLIB_LIBRARIES` to `LIBGIT2_LIBS` so don't also add the `z` library (libgit2/#5079).

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7a1898f..c23e019 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -327,12 +327,6 @@ IF(NOT USE_BUNDLED_ZLIB)
 	IF(ZLIB_FOUND)
 		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")
-		ENDIF()
 		ADD_FEATURE_INFO(zlib ON "using system zlib")
 	ELSE()
 		MESSAGE(STATUS "zlib was not found; using bundled 3rd-party sources." )