Skip to content

Commit 4891d81

Browse files
Vollstreckermadler
authored andcommitted
CMake: Give minizip a suffix on Cygwin as well.
1 parent de4dea8 commit 4891d81

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

.github/workflows/msys-cygwin.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ jobs:
6868
cmake /cygdrive/d/a/zlib/zlib \
6969
-B build \
7070
-DCMAKE_BUILD_TYPE=Release \
71-
-DZLIB_BUILD_MINIZIP=OFF \
71+
-DZLIB_BUILD_MINIZIP=ON \
72+
-DMINIZIP_ENABLE_BZIP2=OFF \
7273
-G Ninja
7374
- name: Build
7475
run: cmake --build build --config Release -v -j1

contrib/minizip/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,10 @@ set(MINIUNZIP_HDRS
114114
unzip.h
115115
zip.h)
116116

117-
if(WIN32)
117+
if(WIN32 OR CYGWIN)
118118
set(minizip_static_suffix "s")
119119
set(CMAKE_DEBUG_POSTFIX "d")
120-
endif(WIN32)
120+
endif(WIN32 OR CYGWIN)
121121

122122
if(MINIZIP_BUILD_SHARED)
123123
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS TRUE)

0 commit comments

Comments
 (0)