diff options
author | Vollstrecker <werner@vollstreckernet.de> | 2024-12-24 21:42:47 +0100 |
---|---|---|
committer | Mark Adler <madler@alumni.caltech.edu> | 2025-01-31 19:59:10 -0800 |
commit | d3ab1df503abffbc2480d10c110e955bad803e0a (patch) | |
tree | 4272233892dba4ded7ca8d3ee152186ea06399b6 /.github | |
parent | 5163cb6d3bd6fa72d7be7213f786455778a5e8f7 (diff) | |
download | zlib-d3ab1df503abffbc2480d10c110e955bad803e0a.tar.gz zlib-d3ab1df503abffbc2480d10c110e955bad803e0a.tar.bz2 zlib-d3ab1df503abffbc2480d10c110e955bad803e0a.zip |
CMake: Test minizip in the workflows.
Diffstat (limited to '.github')
-rw-r--r-- | .github/workflows/c-std.yml | 4 | ||||
-rw-r--r-- | .github/workflows/cmake.yml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.github/workflows/c-std.yml b/.github/workflows/c-std.yml index 8377db4..64a1c86 100644 --- a/.github/workflows/c-std.yml +++ b/.github/workflows/c-std.yml | |||
@@ -133,7 +133,7 @@ jobs: | |||
133 | - name: Generate project files (cmake) | 133 | - name: Generate project files (cmake) |
134 | if: matrix.builder == 'cmake' | 134 | if: matrix.builder == 'cmake' |
135 | run: | | 135 | run: | |
136 | cmake -S . -B . -D CMAKE_BUILD_TYPE=Release ${{ matrix.os.cmake-opt }} | 136 | cmake -S . -B . -D CMAKE_BUILD_TYPE=Release ${{ matrix.os.cmake-opt }} -DZLIB_BUILD_MINIZIP=ON |
137 | env: | 137 | env: |
138 | CC: ${{ matrix.compiler }} | 138 | CC: ${{ matrix.compiler }} |
139 | CFLAGS: -std=${{ matrix.std.value }} ${{ matrix.arch.compiler-opt }} -Werror -Wall -Wextra | 139 | CFLAGS: -std=${{ matrix.std.value }} ${{ matrix.arch.compiler-opt }} -Werror -Wall -Wextra |
@@ -196,7 +196,7 @@ jobs: | |||
196 | 196 | ||
197 | - name: Generate project files (cmake) | 197 | - name: Generate project files (cmake) |
198 | run: | | 198 | run: | |
199 | cmake -S . -B . ${{ matrix.arch.value }} -D CMAKE_BUILD_TYPE=Release | 199 | cmake -S . -B . ${{ matrix.arch.value }} -D CMAKE_BUILD_TYPE=Release -DZLIB_BUILD_MINIZIP=ON |
200 | env: | 200 | env: |
201 | CC: ${{ matrix.compiler }} | 201 | CC: ${{ matrix.compiler }} |
202 | CFLAGS: /WX ${{ matrix.std.value }} | 202 | CFLAGS: /WX ${{ matrix.std.value }} |
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 36fb249..a157124 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml | |||
@@ -75,7 +75,7 @@ jobs: | |||
75 | choco install --no-progress ninja ${{ matrix.packages }} | 75 | choco install --no-progress ninja ${{ matrix.packages }} |
76 | 76 | ||
77 | - name: Generate project files | 77 | - name: Generate project files |
78 | run: cmake -S ${{ matrix.src-dir || '.' }} -B ${{ matrix.build-dir || '.' }} ${{ matrix.cmake-args }} -D CMAKE_BUILD_TYPE=${{ matrix.build-config || 'Release' }} | 78 | run: cmake -S ${{ matrix.src-dir || '.' }} -B ${{ matrix.build-dir || '.' }} ${{ matrix.cmake-args }} -D CMAKE_BUILD_TYPE=${{ matrix.build-config || 'Release' }} -DZLIB_BUILD_MINIZIP=ON |
79 | env: | 79 | env: |
80 | CC: ${{ matrix.compiler }} | 80 | CC: ${{ matrix.compiler }} |
81 | CFLAGS: ${{ matrix.cflags }} | 81 | CFLAGS: ${{ matrix.cflags }} |