No commit message

brechtsanders · Nov 2, 2022 · 81e4a6a · 81e4a6a
1 parent 8e164d0
commit 81e4a6a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 13 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -23,6 +23,7 @@ OPTION(BUILD_TOOLS "Build tools" ON)
 OPTION(BUILD_EXAMPLES "Build examples" ON)
 OPTION(WITH_LIBZIP "Use libzip instead of Minizip" OFF)
 OPTION(WITH_MINIZIP_NG "Use Minizip NG" OFF)
+OPTION(MINIZIP_NG_SUFFIX "Minizip NG suffix (default is empty)" "")
 OPTION(WITH_WIDE "Also build UTF-16 library (libxlsxio_readw)" OFF)
 SET(ZLIB_DIR "" CACHE PATH "Path to the zlib library")
 IF(WITH_LIBZIP)
@@ -44,23 +45,22 @@ IF(ZLIB_DIR)
   SET(ZLIB_ROOT ${ZLIB_DIR})
 ENDIF()
 #FIND_PACKAGE(ZLIB REQUIRED)
-#   dependancy: libzip
+#   dependancy: libzip/minizip/minizip-ng
 IF(WITH_LIBZIP)
   FIND_PACKAGE(LibZip REQUIRED)
   SET(ANYZIP_INCLUDE_DIRS ${LIBZIP_INCLUDE_DIRS})
   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)
 ELSE()
-  IF(WITH_MINIZIP_NG)
-    FIND_PACKAGE(minizip REQUIRED)
-    SET(ANYZIP_LIBRARIES MINIZIP::minizip)
-    SET(ANYZIP_DEF USE_LIBZIP;USE_MINIZIP_NG)
-  ELSE()
-    FIND_PACKAGE(minizip REQUIRED)
-    SET(ANYZIP_INCLUDE_DIRS ${MINIZIP_INCLUDE_DIRS})
-    SET(ANYZIP_LIBRARIES ${MINIZIP_LIBRARIES})
-    SET(ANYZIP_DEF USE_MINIZIP)
-  ENDIF()
+  FIND_PACKAGE(Minizip REQUIRED)
+  SET(ANYZIP_INCLUDE_DIRS ${MINIZIP_INCLUDE_DIRS})
+  SET(ANYZIP_LIBRARIES ${MINIZIP_LIBRARIES})
+  SET(ANYZIP_DEF USE_MINIZIP)
 ENDIF()
 #   dependancy: expat
 IF(EXPAT_DIR)

diff --git a/Changelog.txt b/Changelog.txt
@@ -1,8 +1,14 @@
+0.2.34
+
+2022-11-02  Brecht Sanders  https://github.com/brechtsanders/
+
+  * PR from captaingroove tp add minizip-ng support (#115)
+
 0.2.33
 
 2022-07-05  Brecht Sanders  https://github.com/brechtsanders/
 
-  * PR from JackBoosY to export CMake targets automaticly (to cmake folder under install path)
+  * PR from JackBoosY to export CMake targets automaticly (to cmake folder under install path) (#105)
 
 0.2.32
 

diff --git a/include/xlsxio_version.h b/include/xlsxio_version.h
@@ -49,7 +49,7 @@ THE SOFTWARE.
 /*! \brief minor version number */
 #define XLSXIO_VERSION_MINOR 2
 /*! \brief micro version number */
-#define XLSXIO_VERSION_MICRO 33
+#define XLSXIO_VERSION_MICRO 34
 /*! @} */
 
 /*! \cond PRIVATE */