use included zlib

Murmele · May 1, 2022 · 3017195 · 3017195
1 parent 3c1b0e2
commit 3017195
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 2 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -246,7 +246,7 @@ jobs:
         run: |
           mkdir -p build/release
           cd build/release
-          cmake -G Ninja -DDEPRECATE_HARD:BOOL=ON -DCMAKE_BUILD_TYPE=Release ${{ env.CMAKE_FLAGS }} ${{ matrix.env.cmake_flags }} ../..
+          cmake -G Ninja -DDEPRECATE_HARD:BOOL=ON -DUSE_BUNDLED_ZLIB:BOOL=ON -DCMAKE_BUILD_TYPE=Release ${{ env.CMAKE_FLAGS }} ${{ matrix.env.cmake_flags }} ../..
 
       - name: Build Information
         run: |

diff --git a/dep/CMakeLists.txt b/dep/CMakeLists.txt
@@ -3,6 +3,8 @@ find_package(PkgConfig)
 add_subdirectory(openssl)
 add_subdirectory(libssh2)
 add_subdirectory(libgit2)
+# otherwise the zlib is not available in the src/git
+set(LIBGIT2_DEPENDENCY_OBJECTS ${LIBGIT2_DEPENDENCY_OBJECTS} PARENT_SCOPE)
 
 add_subdirectory(cmark)
 add_subdirectory(lua)

diff --git a/dep/libgit2/CMakeLists.txt b/dep/libgit2/CMakeLists.txt
@@ -33,3 +33,5 @@ if(WIN32)
 endif()
 
 add_subdirectory(libgit2)
+# otherwise the zlib is not available in the src/git
+set(LIBGIT2_DEPENDENCY_OBJECTS ${LIBGIT2_DEPENDENCY_OBJECTS} PARENT_SCOPE)
diff --git a/dep/libgit2/libgit2 b/dep/libgit2/libgit2
diff --git a/src/git/CMakeLists.txt b/src/git/CMakeLists.txt
@@ -29,6 +29,7 @@ add_library(
 
 target_link_libraries(git
   libgit2
+  ${LIBGIT2_DEPENDENCY_OBJECTS}
   Qt5::Core
   Qt5::Network
 )