mirror of
https://github.com/madler/zlib
synced 2025-03-28 21:13:15 +00:00
CMake: Do not test with bzip2 on Windows or Cygwin.
This commit is contained in:
parent
05051d236b
commit
6c2ab4ddc6
14
.github/workflows/cmake.yml
vendored
14
.github/workflows/cmake.yml
vendored
@ -13,18 +13,21 @@ jobs:
|
||||
compiler: gcc
|
||||
cflags: -Wall -Wextra
|
||||
pkgtgt: package package_source
|
||||
cmake-args: -DMINIZIP_ENABLE_BZIP2=ON
|
||||
|
||||
- name: Ubuntu GCC -O3
|
||||
os: ubuntu-latest
|
||||
compiler: gcc
|
||||
cflags: -O3 -Wall -Wextra
|
||||
pkgtgt: package package_source
|
||||
cmake-args: -DMINIZIP_ENABLE_BZIP2=ON
|
||||
|
||||
- name: Ubuntu Clang
|
||||
os: ubuntu-latest
|
||||
compiler: clang
|
||||
cflags: -Wall -Wextra
|
||||
pkgtgt: package package_source
|
||||
cmake-args: -DMINIZIP_ENABLE_BZIP2=ON
|
||||
|
||||
- name: Ubuntu Clang Debug
|
||||
os: ubuntu-latest
|
||||
@ -32,6 +35,7 @@ jobs:
|
||||
cflags: -Wall -Wextra
|
||||
build-config: Debug
|
||||
pkgtgt: package package_source
|
||||
cmake-args: -DMINIZIP_ENABLE_BZIP2=ON
|
||||
|
||||
- name: Windows MSVC Win32
|
||||
os: windows-latest
|
||||
@ -46,6 +50,7 @@ jobs:
|
||||
cflags: /W3
|
||||
cmake-args: -A x64
|
||||
pkgtgt: PACKAGE
|
||||
cmake-args: -DMINIZIP_ENABLE_BZIP2=OFF
|
||||
|
||||
- name: Windows GCC
|
||||
os: windows-latest
|
||||
@ -53,18 +58,21 @@ jobs:
|
||||
cflags: -Wall -Wextra
|
||||
cmake-args: -G Ninja
|
||||
pkgtgt: package
|
||||
cmake-args: -DMINIZIP_ENABLE_BZIP2=OFF
|
||||
|
||||
- name: macOS Clang
|
||||
os: macos-latest
|
||||
compiler: clang
|
||||
cflags: -Wall -Wextra
|
||||
pkgtgt: package
|
||||
cmake-args: -DMINIZIP_ENABLE_BZIP2=ON
|
||||
|
||||
- name: macOS GCC
|
||||
os: macos-latest
|
||||
compiler: gcc-12
|
||||
cflags: -Wall -Wextra
|
||||
pkgtgt: package
|
||||
cmake-args: -DMINIZIP_ENABLE_BZIP2=ON
|
||||
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
@ -73,14 +81,14 @@ jobs:
|
||||
- name: Install packages (Windows)
|
||||
if: runner.os == 'Windows'
|
||||
run: |
|
||||
choco install --no-progress ninja bzip2
|
||||
choco install --no-progress ninja
|
||||
|
||||
- name: Install packages (Linux)
|
||||
if: runner.os == 'Linux'
|
||||
run: |
|
||||
apt install libbz2-dev
|
||||
sudo apt install libbz2-dev
|
||||
- name: Generate project files
|
||||
run: cmake -S . -B ../build ${{ matrix.cmake-args }} -D CMAKE_BUILD_TYPE=${{ matrix.build-config || 'Release' }} -DZLIB_BUILD_MINIZIP=ON -DMINIZIP_ENABLE_BZIP2=ON
|
||||
run: cmake -S . -B ../build ${{ matrix.cmake-args }} -D CMAKE_BUILD_TYPE=${{ matrix.build-config || 'Release' }} -DZLIB_BUILD_MINIZIP=ON
|
||||
env:
|
||||
CC: ${{ matrix.compiler }}
|
||||
CFLAGS: ${{ matrix.cflags }}
|
||||
|
3
.github/workflows/msys-cygwin.yml
vendored
3
.github/workflows/msys-cygwin.yml
vendored
@ -58,7 +58,6 @@ jobs:
|
||||
uses: cygwin/cygwin-install-action@master
|
||||
with:
|
||||
packages: >-
|
||||
bzip2
|
||||
cmake
|
||||
cygwin-devel
|
||||
gcc-core
|
||||
@ -70,7 +69,7 @@ jobs:
|
||||
-B build \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DZLIB_BUILD_MINIZIP=ON \
|
||||
-DMINIZIP_ENABLE_BZIP2=ON \
|
||||
-DMINIZIP_ENABLE_BZIP2=OFF
|
||||
-G Ninja
|
||||
- name: Build
|
||||
run: cmake --build build --config Release -v -j1
|
||||
|
Loading…
x
Reference in New Issue
Block a user