From 4891d8185a48f694c80a7c648b97ea48b3ad9165 Mon Sep 17 00:00:00 2001 From: Vollstrecker Date: Fri, 24 Jan 2025 10:42:58 +0100 Subject: [PATCH] CMake: Give minizip a suffix on Cygwin as well. --- .github/workflows/msys-cygwin.yml | 3 ++- contrib/minizip/CMakeLists.txt | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/msys-cygwin.yml b/.github/workflows/msys-cygwin.yml index 460954b0..e76be9f0 100644 --- a/.github/workflows/msys-cygwin.yml +++ b/.github/workflows/msys-cygwin.yml @@ -68,7 +68,8 @@ jobs: cmake /cygdrive/d/a/zlib/zlib \ -B build \ -DCMAKE_BUILD_TYPE=Release \ - -DZLIB_BUILD_MINIZIP=OFF \ + -DZLIB_BUILD_MINIZIP=ON \ + -DMINIZIP_ENABLE_BZIP2=OFF \ -G Ninja - name: Build run: cmake --build build --config Release -v -j1 diff --git a/contrib/minizip/CMakeLists.txt b/contrib/minizip/CMakeLists.txt index 1109585c..46d4348a 100644 --- a/contrib/minizip/CMakeLists.txt +++ b/contrib/minizip/CMakeLists.txt @@ -114,10 +114,10 @@ set(MINIUNZIP_HDRS unzip.h zip.h) -if(WIN32) +if(WIN32 OR CYGWIN) set(minizip_static_suffix "s") set(CMAKE_DEBUG_POSTFIX "d") -endif(WIN32) +endif(WIN32 OR CYGWIN) if(MINIZIP_BUILD_SHARED) set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS TRUE)