diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 52fc2a69b9..818ac4fb17 100644 --- 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 index 54cb4ae42e..041f1092e7 100644 --- 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 index b03566b9c8..62b83c4ff0 100644 --- 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 index a8d5610091..37605e935a 160000 --- a/dep/libgit2/libgit2 +++ b/dep/libgit2/libgit2 @@ -1 +1 @@ -Subproject commit a8d5610091aaa91cb73123b2d540775e324eb92c +Subproject commit 37605e935a3356f384d4493ef8fd38c7a830f05b diff --git a/src/git/CMakeLists.txt b/src/git/CMakeLists.txt index 995434d014..b8ff37ae0f 100644 --- 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 )