diff options
| author | Patrick Steinhardt <ps@pks.im> | 2019-05-21 12:05:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-21 12:05:50 +0200 |
| commit | 6b9cc0290f8310c5ea43351077476e9601c29783 (patch) | |
| tree | 11413891ec2babbc13afe044df5c58d9b74d56f6 | |
| parent | 040db8ad749ce7cfff1148993a71e31f6a52ca9e (diff) | |
| parent | ada1cd01065d40e6e5222d2c6d975517ebe2a44d (diff) | |
| download | libgit2-6b9cc0290f8310c5ea43351077476e9601c29783.tar.gz | |
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
| -rw-r--r-- | src/CMakeLists.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7a1898fe7..00021b828 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") |