aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVollstrecker <werner@vollstreckernet.de>2024-12-31 14:18:49 +0100
committerMark Adler <madler@alumni.caltech.edu>2025-01-31 20:02:26 -0800
commitb8ae23d4c839093b3f63fb2af85f1cc3d6562c86 (patch)
tree2ab7a4a8ffd59efd16cff27b6350dba89b4e0955
parent7667ca55931302d8e35c37a46851eb02191d465f (diff)
downloadzlib-b8ae23d4c839093b3f63fb2af85f1cc3d6562c86.tar.gz
zlib-b8ae23d4c839093b3f63fb2af85f1cc3d6562c86.tar.bz2
zlib-b8ae23d4c839093b3f63fb2af85f1cc3d6562c86.zip
CMake: Disable bzip2 for tests.
It's not installed everywhere.
-rw-r--r--.github/workflows/c-std.yml4
-rw-r--r--.github/workflows/cmake.yml2
-rw-r--r--contrib/minizip/test/add_subdirectory_exclude_test.cmake.in1
-rw-r--r--contrib/minizip/test/add_subdirectory_test.cmake.in1
4 files changed, 5 insertions, 3 deletions
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:
141 - name: Generate project files with tests (cmake) 141 - name: Generate project files with tests (cmake)
142 if: matrix.builder == 'cmake' 142 if: matrix.builder == 'cmake'
143 run: | 143 run: |
144 cmake -S . -B ./build2 -D CMAKE_BUILD_TYPE=Release ${{ matrix.os.cmake-opt }} -DZLIB_BUILD_MINIZIP=ON 144 cmake -S . -B ./build2 -D CMAKE_BUILD_TYPE=Release ${{ matrix.os.cmake-opt }} -DZLIB_BUILD_MINIZIP=ON -DMINIZIP_ENABLE_BZIP2=OFF
145 env: 145 env:
146 CC: ${{ matrix.compiler }} 146 CC: ${{ matrix.compiler }}
147 CFLAGS: -std=${{ matrix.std.value }} ${{ matrix.arch.compiler-opt }} -Wall -Wextra 147 CFLAGS: -std=${{ matrix.std.value }} ${{ matrix.arch.compiler-opt }} -Wall -Wextra
@@ -215,7 +215,7 @@ jobs:
215 215
216 - name: Generate project files with tests (cmake) 216 - name: Generate project files with tests (cmake)
217 run: | 217 run: |
218 cmake -S . -B ./build2 ${{ matrix.arch.value }} -D CMAKE_BUILD_TYPE=Release -DZLIB_BUILD_MINIZIP=ON 218 cmake -S . -B ./build2 ${{ matrix.arch.value }} -D CMAKE_BUILD_TYPE=Release -DZLIB_BUILD_MINIZIP=ON -DMINIZIP_ENABLE_BZIP2=OFF
219 env: 219 env:
220 CC: ${{ matrix.compiler }} 220 CC: ${{ matrix.compiler }}
221 CFLAGS: ${{ matrix.std.value }} 221 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:
76 choco install --no-progress ninja ${{ matrix.packages }} 76 choco install --no-progress ninja ${{ matrix.packages }}
77 77
78 - name: Generate project files 78 - name: Generate project files
79 run: cmake -S . -B ../build ${{ matrix.cmake-args }} -D CMAKE_BUILD_TYPE=${{ matrix.build-config || 'Release' }} -DZLIB_BUILD_MINIZIP=ON 79 run: cmake -S . -B ../build ${{ matrix.cmake-args }} -D CMAKE_BUILD_TYPE=${{ matrix.build-config || 'Release' }} -DZLIB_BUILD_MINIZIP=ON -DMINIZIP_ENABLE_BZIP2=OFF
80 env: 80 env:
81 CC: ${{ matrix.compiler }} 81 CC: ${{ matrix.compiler }}
82 CFLAGS: ${{ matrix.cflags }} 82 CFLAGS: ${{ matrix.cflags }}
diff --git a/contrib/minizip/test/add_subdirectory_exclude_test.cmake.in b/contrib/minizip/test/add_subdirectory_exclude_test.cmake.in
index 277b2cd..f662cda 100644
--- a/contrib/minizip/test/add_subdirectory_exclude_test.cmake.in
+++ b/contrib/minizip/test/add_subdirectory_exclude_test.cmake.in
@@ -7,6 +7,7 @@ project(minizip_add_subdirectory_exclude_from_all
7option(MINIZIP_BUILD_TESTING "" OFF) 7option(MINIZIP_BUILD_TESTING "" OFF)
8option(MINIZIP_BUILD_SHARED "" @MINIZIP_BUILD_SHARED@) 8option(MINIZIP_BUILD_SHARED "" @MINIZIP_BUILD_SHARED@)
9option(MINIZIP_BUILD_STATIC "" @MINIZIP_BUILD_STATIC@) 9option(MINIZIP_BUILD_STATIC "" @MINIZIP_BUILD_STATIC@)
10option(MINIZIP_ENABLE_BZIP2 "" @MINIZIP_ENABLE_BZIP2@)
10 11
11add_subdirectory(@minizip_SOURCE_DIR@ ${CMAKE_CURRENT_BINARY_DIR}/minizip EXCLUDE_FROM_ALL) 12add_subdirectory(@minizip_SOURCE_DIR@ ${CMAKE_CURRENT_BINARY_DIR}/minizip EXCLUDE_FROM_ALL)
12 13
diff --git a/contrib/minizip/test/add_subdirectory_test.cmake.in b/contrib/minizip/test/add_subdirectory_test.cmake.in
index a29b415..be5c664 100644
--- a/contrib/minizip/test/add_subdirectory_test.cmake.in
+++ b/contrib/minizip/test/add_subdirectory_test.cmake.in
@@ -7,6 +7,7 @@ project(minizip_add_subdirectory_exclude_from_all
7option(MINIZIP_BUILD_TESTING "" OFF) 7option(MINIZIP_BUILD_TESTING "" OFF)
8option(MINIZIP_BUILD_SHARED "" @MINIZIP_BUILD_SHARED@) 8option(MINIZIP_BUILD_SHARED "" @MINIZIP_BUILD_SHARED@)
9option(MINIZIP_BUILD_STATIC "" @MINIZIP_BUILD_STATIC@) 9option(MINIZIP_BUILD_STATIC "" @MINIZIP_BUILD_STATIC@)
10option(MINIZIP_ENABLE_BZIP2 "" @MINIZIP_ENABLE_BZIP2@)
10 11
11add_subdirectory(@minizip_SOURCE_DIR@ ${CMAKE_CURRENT_BINARY_DIR}/minizip) 12add_subdirectory(@minizip_SOURCE_DIR@ ${CMAKE_CURRENT_BINARY_DIR}/minizip)
12 13