aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVollstrecker <werner@vollstreckernet.de>2025-01-24 10:42:58 +0100
committerMark Adler <madler@alumni.caltech.edu>2025-01-31 20:02:26 -0800
commit4891d8185a48f694c80a7c648b97ea48b3ad9165 (patch)
tree6d2c6b20b9ec2a76d26da0966638ef1c4c3d25eb
parentde4dea800767466543bc7e7afeb162414e36dad3 (diff)
downloadzlib-4891d8185a48f694c80a7c648b97ea48b3ad9165.tar.gz
zlib-4891d8185a48f694c80a7c648b97ea48b3ad9165.tar.bz2
zlib-4891d8185a48f694c80a7c648b97ea48b3ad9165.zip
CMake: Give minizip a suffix on Cygwin as well.
-rw-r--r--.github/workflows/msys-cygwin.yml3
-rw-r--r--contrib/minizip/CMakeLists.txt4
2 files changed, 4 insertions, 3 deletions
diff --git a/.github/workflows/msys-cygwin.yml b/.github/workflows/msys-cygwin.yml
index 460954b..e76be9f 100644
--- a/.github/workflows/msys-cygwin.yml
+++ b/.github/workflows/msys-cygwin.yml
@@ -68,7 +68,8 @@ jobs:
68 cmake /cygdrive/d/a/zlib/zlib \ 68 cmake /cygdrive/d/a/zlib/zlib \
69 -B build \ 69 -B build \
70 -DCMAKE_BUILD_TYPE=Release \ 70 -DCMAKE_BUILD_TYPE=Release \
71 -DZLIB_BUILD_MINIZIP=OFF \ 71 -DZLIB_BUILD_MINIZIP=ON \
72 -DMINIZIP_ENABLE_BZIP2=OFF \
72 -G Ninja 73 -G Ninja
73 - name: Build 74 - name: Build
74 run: cmake --build build --config Release -v -j1 75 run: cmake --build build --config Release -v -j1
diff --git a/contrib/minizip/CMakeLists.txt b/contrib/minizip/CMakeLists.txt
index 1109585..46d4348 100644
--- a/contrib/minizip/CMakeLists.txt
+++ b/contrib/minizip/CMakeLists.txt
@@ -114,10 +114,10 @@ set(MINIUNZIP_HDRS
114 unzip.h 114 unzip.h
115 zip.h) 115 zip.h)
116 116
117if(WIN32) 117if(WIN32 OR CYGWIN)
118 set(minizip_static_suffix "s") 118 set(minizip_static_suffix "s")
119 set(CMAKE_DEBUG_POSTFIX "d") 119 set(CMAKE_DEBUG_POSTFIX "d")
120endif(WIN32) 120endif(WIN32 OR CYGWIN)
121 121
122if(MINIZIP_BUILD_SHARED) 122if(MINIZIP_BUILD_SHARED)
123 set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS TRUE) 123 set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS TRUE)