From b8ae23d4c839093b3f63fb2af85f1cc3d6562c86 Mon Sep 17 00:00:00 2001 From: Vollstrecker Date: Tue, 31 Dec 2024 14:18:49 +0100 Subject: CMake: Disable bzip2 for tests. It's not installed everywhere. --- .github/workflows/c-std.yml | 4 ++-- .github/workflows/cmake.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to '.github') diff --git a/.github/workflows/c-std.yml b/.github/workflows/c-std.yml index bc93110..a99cdb5 100644 --- a/.github/workflows/c-std.yml +++ b/.github/workflows/c-std.yml @@ -141,7 +141,7 @@ jobs: - name: Generate project files with tests (cmake) if: matrix.builder == 'cmake' run: | - cmake -S . -B ./build2 -D CMAKE_BUILD_TYPE=Release ${{ matrix.os.cmake-opt }} -DZLIB_BUILD_MINIZIP=ON + cmake -S . -B ./build2 -D CMAKE_BUILD_TYPE=Release ${{ matrix.os.cmake-opt }} -DZLIB_BUILD_MINIZIP=ON -DMINIZIP_ENABLE_BZIP2=OFF env: CC: ${{ matrix.compiler }} CFLAGS: -std=${{ matrix.std.value }} ${{ matrix.arch.compiler-opt }} -Wall -Wextra @@ -215,7 +215,7 @@ jobs: - name: Generate project files with tests (cmake) run: | - cmake -S . -B ./build2 ${{ matrix.arch.value }} -D CMAKE_BUILD_TYPE=Release -DZLIB_BUILD_MINIZIP=ON + cmake -S . -B ./build2 ${{ matrix.arch.value }} -D CMAKE_BUILD_TYPE=Release -DZLIB_BUILD_MINIZIP=ON -DMINIZIP_ENABLE_BZIP2=OFF env: CC: ${{ matrix.compiler }} CFLAGS: ${{ matrix.std.value }} diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 40aae60..1b61711 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -76,7 +76,7 @@ jobs: choco install --no-progress ninja ${{ matrix.packages }} - name: Generate project files - run: cmake -S . -B ../build ${{ matrix.cmake-args }} -D CMAKE_BUILD_TYPE=${{ matrix.build-config || 'Release' }} -DZLIB_BUILD_MINIZIP=ON + run: cmake -S . -B ../build ${{ matrix.cmake-args }} -D CMAKE_BUILD_TYPE=${{ matrix.build-config || 'Release' }} -DZLIB_BUILD_MINIZIP=ON -DMINIZIP_ENABLE_BZIP2=OFF env: CC: ${{ matrix.compiler }} CFLAGS: ${{ matrix.cflags }} -- cgit v1.2.3-55-g6feb