c/xlsxio
1
0
Fork 0
mirror of https://github.com/brechtsanders/xlsxio synced 2025-03-28 21:13:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
Brecht Sanders 2022-11-02 13:00:52 +01:00
parent 8e164d0515
commit 81e4a6aba2
3 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
CMakeLists.txt
View File

@ -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)

8
Changelog.txt
View File

@ -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

2
include/xlsxio_version.h
View File

@ -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 */