Skip to content

G
git2
Unverified Commit 6b9cc029 by Patrick Steinhardt Committed by GitHub
Options

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
parents 040db8ad ada1cd01
Showing with 0 additions and 1 deletions
src/CMakeLists.txt
...@@ -328,7 +328,6 @@ IF(NOT USE_BUNDLED_ZLIB) ...@@ -328,7 +328,6 @@ IF(NOT USE_BUNDLED_ZLIB)
LIST(APPEND LIBGIT2_SYSTEM_INCLUDES ${ZLIB_INCLUDE_DIRS}) LIST(APPEND LIBGIT2_SYSTEM_INCLUDES ${ZLIB_INCLUDE_DIRS})
LIST(APPEND LIBGIT2_LIBS ${ZLIB_LIBRARIES}) LIST(APPEND LIBGIT2_LIBS ${ZLIB_LIBRARIES})
IF(APPLE OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD") IF(APPLE OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
LIST(APPEND LIBGIT2_LIBS "z")
LIST(APPEND LIBGIT2_PC_LIBS "-lz") LIST(APPEND LIBGIT2_PC_LIBS "-lz")
ELSE() ELSE()
LIST(APPEND LIBGIT2_PC_REQUIRES "zlib") LIST(APPEND LIBGIT2_PC_REQUIRES "zlib")
......
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