Skip to content

minizip: fix includes breakage #1205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mildsunrise wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

minizip: fix includes breakage #1205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
11d5e2f
install compat headers
mildsunrise Mar 10, 2026
eaad6bb
[1/2] make CMake consistent with autotools
mildsunrise Mar 10, 2026
1497ac3
[2/2] make CMake consistent with autotools
mildsunrise Mar 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion contrib/minizip/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,10 @@ unset(CMAKE_REQUIRED_FLAGS)
set(LIBMINIZIP_SRCS ioapi.c mztools.c unzip.c zip.c)

set(LIBMINIZIP_HDRS crypt.h ints.h ioapi.h mztools.h unzip.h zip.h)
list(TRANSFORM LIBMINIZIP_HDRS PREPEND compat/ OUTPUT_VARIABLE LIBMINIZIP_HDRS_COMPAT)

set(LIBMINIZIP_PC ${minizip_BINARY_DIR}/minizip.pc)
configure_file(${minizip_SOURCE_DIR}/minizip.pc.txt ${LIBMINIZIP_PC} @ONLY)

set(MINIZIP_SRCS ioapi.c $<$<BOOL:${WIN32}>:iowin32.c> minizip.c zip.c)

Expand Down Expand Up @@ -273,7 +277,15 @@ if(MINIZIP_INSTALL)
install(
FILES ${LIBMINIZIP_HDRS}
COMPONENT Development
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/minizip")
install(
FILES ${LIBMINIZIP_HDRS_COMPAT}
COMPONENT Development
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/minizip/compat")
install(
FILES ${LIBMINIZIP_PC}
COMPONENT Development
DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
endif(MINIZIP_INSTALL)

if(MINIZIP_BUILD_TESTING)
Expand Down
14 changes: 7 additions & 7 deletions contrib/minizip/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ libminizip_la_SOURCES = \
libminizip_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 -lz

minizip_includedir = $(includedir)/minizip
minizip_include_HEADERS = \
crypt.h \
ints.h \
ioapi.h \
mztools.h \
unzip.h \
zip.h \
nobase_minizip_include_HEADERS = \
crypt.h compat/crypt.h \
ints.h compat/ints.h \
ioapi.h compat/ioapi.h \
mztools.h compat/mztools.h \
unzip.h compat/unzip.h \
zip.h compat/zip.h \
${iowin32_h}

pkgconfigdir = $(libdir)/pkgconfig
Expand Down
2 changes: 2 additions & 0 deletions contrib/minizip/compat/crypt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#warning "please include <minizip/crypt.h> instead; in future releases #include <crypt.h> will stop working"
#include <minizip/crypt.h>
2 changes: 2 additions & 0 deletions contrib/minizip/compat/ints.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#warning "please include <minizip/ints.h> instead; in future releases #include <ints.h> will stop working"
#include <minizip/ints.h>
2 changes: 2 additions & 0 deletions contrib/minizip/compat/ioapi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#warning "please include <minizip/ioapi.h> instead; in future releases #include <ioapi.h> will stop working"
#include <minizip/ioapi.h>
2 changes: 2 additions & 0 deletions contrib/minizip/compat/mztools.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#warning "please include <minizip/mztools.h> instead; in future releases #include <mztools.h> will stop working"
#include <minizip/mztools.h>
2 changes: 2 additions & 0 deletions contrib/minizip/compat/unzip.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#warning "please include <minizip/unzip.h> instead; in future releases #include <unzip.h> will stop working"
#include <minizip/unzip.h>
2 changes: 2 additions & 0 deletions contrib/minizip/compat/zip.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#warning "please include <minizip/zip.h> instead; in future releases #include <zip.h> will stop working"
#include <minizip/zip.h>
2 changes: 1 addition & 1 deletion contrib/minizip/minizip.pc.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ Version: @PACKAGE_VERSION@
License: Zlib
Libs: -L${libdir} -lminizip
Libs.private: -lz
Cflags: -I${includedir}
Cflags: -I${includedir} -I${includedir}/minizip/compat
2 changes: 1 addition & 1 deletion contrib/minizip/minizip.pc.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ Version: @minizip_VERSION@

Requires:
Libs: -L${libdir} -L${sharedlibdir} -lz -lminizip
Cflags: -I${includedir}
Cflags: -I${includedir} -I${includedir}/minizip/compat