Skip to content

Use the correct minizip-ng header folder #144

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
uilianries wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Use the correct minizip-ng header folder #144

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
33bb329
Add support for Minizip-NG >=4.0.7
uilianries Dec 9, 2025
efd5647
Required minizip-ng 4.0.7
uilianries Dec 9, 2025
b513ee8
Revert "Required minizip-ng 4.0.7"
uilianries Dec 9, 2025
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
13 changes: 6 additions & 7 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
CMAKE_MINIMUM_REQUIRED(VERSION 3.15)

PROJECT(xlsxio DESCRIPTION "C libraries for reading and writing .xlsx files")
PROJECT(xlsxio DESCRIPTION "C libraries for reading and writing .xlsx files" LANGUAGES C)

# get version number
FILE(READ "include/xlsxio_version.h" VERFILE)
Expand Down Expand Up @@ -52,10 +52,9 @@ IF(WITH_LIBZIP)
SET(ANYZIP_LIBRARIES ${LIBZIP_LIBRARIES})
SET(ANYZIP_DEF USE_LIBZIP)
ELSEIF(WITH_MINIZIP_NG)
FIND_PACKAGE(minizip${MINIZIP_NG_SUFFIX} REQUIRED)
SET(ANYZIP_INCLUDE_DIRS "${minizip-ng_DIR}/../../../include/minizip${MINIZIP_NG_SUFFIX}")
SET(ANYZIP_LIBRARIES minizip${MINIZIP_NG_SUFFIX})
SET(ANYZIP_DEF USE_MINIZIP;USE_MINIZIP_NG)
FIND_PACKAGE(minizip${MINIZIP_NG_SUFFIX} CONFIG REQUIRED)
SET(ANYZIP_LIBRARIES MINIZIP::minizip)
SET(ANYZIP_DEF USE_MINIZIP)
ELSE()
FIND_PACKAGE(Minizip REQUIRED)
SET(ANYZIP_INCLUDE_DIRS ${MINIZIP_INCLUDE_DIRS})
Expand Down Expand Up @@ -253,7 +252,7 @@ INSTALL(TARGETS ${ALLTARGETS_EXE}
RUNTIME DESTINATION bin
)
INSTALL(DIRECTORY include/
DESTINATION include
DESTINATION include
FILES_MATCHING PATTERN "xlsxio*.h"
)
IF(MINGW AND BUILD_SHARED)
Expand Down
8 changes: 2 additions & 6 deletions lib/xlsxio_read.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,8 @@
#include <string.h>
#include <expat.h>

#if defined(USE_MINIZIP) || defined(USE_MINIZIP_NG)
# ifdef USE_MINIZIP_NG
# include <minizip-ng/unzip.h>
# else
# include <minizip/unzip.h>
# endif
#if defined(USE_MINIZIP)
# include <minizip/unzip.h>
# define ZIPFILETYPE unzFile
# define ZIPFILEENTRYTYPE unzFile
# if defined(_MSC_VER)
Expand Down
9 changes: 2 additions & 7 deletions lib/xlsxio_write.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,8 @@
#include <fcntl.h>
#include <stdarg.h>

#if defined(USE_MINIZIP) || defined(USE_MINIZIP_NG)
# ifdef USE_MINIZIP_NG
# include <minizip-ng/zip.h>
# else
# include <minizip/zip.h>
# endif
#if defined(USE_MINIZIP)
# include <minizip/zip.h>
# if !defined(Z_DEFLATED) && defined(MZ_COMPRESS_METHOD_DEFLATE) /* support minizip2 which defines MZ_COMPRESS_METHOD_DEFLATE instead of Z_DEFLATED */
# define Z_DEFLATED MZ_COMPRESS_METHOD_DEFLATE
# endif
Expand Down Expand Up @@ -1092,4 +1088,3 @@ DLL_EXPORT_XLSXIO void xlsxiowrite_next_row (xlsxiowriter handle)
handle->rowopen = 0;
handle->pcurrentcolumn = &handle->columninfo;
}