cmake: less yelling
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6e35082..38d275b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,92 +1,92 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.0.2)
+cmake_minimum_required(VERSION 3.0.2)
-LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
-PROJECT(libzip
+project(libzip
VERSION 1.7.1
LANGUAGES C)
-OPTION(ENABLE_COMMONCRYPTO "Enable use of CommonCrypto" ON)
-OPTION(ENABLE_GNUTLS "Enable use of GnuTLS" ON)
-OPTION(ENABLE_MBEDTLS "Enable use of mbed TLS" ON)
-OPTION(ENABLE_OPENSSL "Enable use of OpenSSL" ON)
-OPTION(ENABLE_WINDOWS_CRYPTO "Enable use of Windows cryptography libraries" ON)
+option(ENABLE_COMMONCRYPTO "Enable use of CommonCrypto" ON)
+option(ENABLE_GNUTLS "Enable use of GnuTLS" ON)
+option(ENABLE_MBEDTLS "Enable use of mbed TLS" ON)
+option(ENABLE_OPENSSL "Enable use of OpenSSL" ON)
+option(ENABLE_WINDOWS_CRYPTO "Enable use of Windows cryptography libraries" ON)
-OPTION(ENABLE_BZIP2 "Enable use of BZip2" ON)
-OPTION(ENABLE_LZMA "Enable use of LZMA" ON)
+option(ENABLE_BZIP2 "Enable use of BZip2" ON)
+option(ENABLE_LZMA "Enable use of LZMA" ON)
-OPTION(BUILD_TOOLS "Build tools in the src directory (zipcmp, zipmerge, ziptool)" ON)
-OPTION(BUILD_REGRESS "Build regression tests" ON)
-OPTION(BUILD_EXAMPLES "Build examples" ON)
-OPTION(BUILD_DOC "Build documentation" ON)
+option(BUILD_TOOLS "Build tools in the src directory (zipcmp, zipmerge, ziptool)" ON)
+option(BUILD_REGRESS "Build regression tests" ON)
+option(BUILD_EXAMPLES "Build examples" ON)
+option(BUILD_DOC "Build documentation" ON)
-INCLUDE(CheckFunctionExists)
-INCLUDE(CheckIncludeFiles)
-INCLUDE(CheckLibraryExists)
-INCLUDE(CheckSymbolExists)
-INCLUDE(CheckTypeSize)
-INCLUDE(CheckCSourceRuns)
-INCLUDE(CheckCSourceCompiles)
-INCLUDE(CheckStructHasMember)
-INCLUDE(TestBigEndian)
-INCLUDE(GNUInstallDirs)
-IF(ENABLE_COMMONCRYPTO)
- CHECK_INCLUDE_FILES(CommonCrypto/CommonCrypto.h COMMONCRYPTO_FOUND)
-ELSE()
- SET(COMMONCRYPTO_FOUND FALSE)
-ENDIF()
-IF(ENABLE_GNUTLS)
- INCLUDE(FindNettle)
- INCLUDE(FindGnuTLS)
-ELSE()
- SET(GNUTLS_FOUND FALSE)
-ENDIF()
-IF(ENABLE_MBEDTLS)
- FIND_PATH(MBEDTLS_INCLUDE_DIR mbedtls/aes.h)
- FIND_LIBRARY(MBEDTLS_LIBRARIES NAMES mbedcrypto)
-ELSE()
- SET(MBEDTLS_LIBRARIES FALSE)
-ENDIF()
-IF(ENABLE_OPENSSL)
- INCLUDE(FindOpenSSL)
-ELSE()
- SET(OPENSSL_FOUND FALSE)
-ENDIF()
-IF(WIN32)
- IF(ENABLE_WINDOWS_CRYPTO)
- SET(WINDOWS_CRYPTO_FOUND TRUE)
- ENDIF()
-ELSE()
- SET(WINDOWS_CRYPTO_FOUND FALSE)
-ENDIF()
+include(CheckFunctionExists)
+include(CheckIncludeFiles)
+include(CheckLibraryExists)
+include(CheckSymbolExists)
+include(CheckTypeSize)
+include(CheckCSourceRuns)
+include(CheckCSourceCompiles)
+include(CheckStructHasMember)
+include(TestBigEndian)
+include(GNUInstallDirs)
+if(ENABLE_COMMONCRYPTO)
+ check_include_files(CommonCrypto/CommonCrypto.h COMMONCRYPTO_FOUND)
+else()
+ set(COMMONCRYPTO_FOUND FALSE)
+endif()
+if(ENABLE_GNUTLS)
+ include(FindNettle)
+ include(FindGnuTLS)
+else()
+ set(GNUTLS_FOUND FALSE)
+endif()
+if(ENABLE_MBEDTLS)
+ find_path(MBEDTLS_INCLUDE_DIR mbedtls/aes.h)
+ find_library(MBEDTLS_LIBRARIES NAMES mbedcrypto)
+else()
+ set(MBEDTLS_LIBRARIES FALSE)
+endif()
+if(ENABLE_OPENSSL)
+ include(FindOpenSSL)
+else()
+ set(OPENSSL_FOUND FALSE)
+endif()
+if(WIN32)
+ if(ENABLE_WINDOWS_CRYPTO)
+ set(WINDOWS_CRYPTO_FOUND TRUE)
+ endif()
+else()
+ set(WINDOWS_CRYPTO_FOUND FALSE)
+endif()
-OPTION(BUILD_SHARED_LIBS "Build shared libraries" ON)
-OPTION(LIBZIP_DO_INSTALL "Install libzip and the related files" ON)
+option(BUILD_SHARED_LIBS "Build shared libraries" ON)
+option(LIBZIP_DO_INSTALL "Install libzip and the related files" ON)
-OPTION(SHARED_LIB_VERSIONNING "Add SO version in .so build" ON)
+option(SHARED_LIB_VERSIONNING "Add SO version in .so build" ON)
-FIND_PROGRAM(MDOCTOOL NAMES mandoc groff)
-IF (MDOCTOOL)
- SET(DOCUMENTATION_FORMAT "mdoc" CACHE STRING "Documentation format")
-ELSE()
- FIND_PROGRAM(MANTOOL NAMES nroff)
- IF (MANTOOL)
- SET(DOCUMENTATION_FORMAT "man" CACHE STRING "Documentation format")
- ELSE()
- SET(DOCUMENTATION_FORMAT "html" CACHE STRING "Documentation format")
- ENDIF()
-ENDIF()
+find_program(MDOCTOOL NAMES mandoc groff)
+if (MDOCTOOL)
+ set(DOCUMENTATION_FORMAT "mdoc" CACHE STRING "Documentation format")
+else()
+ find_program(MANTOOL NAMES nroff)
+ if (MANTOOL)
+ set(DOCUMENTATION_FORMAT "man" CACHE STRING "Documentation format")
+ else()
+ set(DOCUMENTATION_FORMAT "html" CACHE STRING "Documentation format")
+ endif()
+endif()
-SET(ARCHIVE_NAME ${CMAKE_PROJECT_NAME}-${CMAKE_PROJECT_VERSION})
+set(ARCHIVE_NAME ${CMAKE_PROJECT_NAME}-${CMAKE_PROJECT_VERSION})
-IF(NOT TARGET dist AND NOT TARGET distcheck)
- ADD_CUSTOM_TARGET(dist
+if(NOT TARGET dist AND NOT TARGET distcheck)
+ add_custom_target(dist
COMMAND git config tar.tar.xz.command "xz -c"
COMMAND git archive --prefix=${ARCHIVE_NAME}/ -o ${ARCHIVE_NAME}.tar.gz HEAD
COMMAND git archive --prefix=${ARCHIVE_NAME}/ -o ${ARCHIVE_NAME}.tar.xz HEAD
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
)
- ADD_CUSTOM_TARGET(distcheck
+ add_custom_target(distcheck
COMMAND chmod -R u+w ${ARCHIVE_NAME} ${ARCHIVE_NAME}-build ${ARCHIVE_NAME}-dest 2>/dev/null || true
COMMAND rm -rf ${ARCHIVE_NAME} ${ARCHIVE_NAME}-build ${ARCHIVE_NAME}-dest
COMMAND ${CMAKE_COMMAND} -E tar xf ${ARCHIVE_NAME}.tar.gz
@@ -105,193 +105,193 @@
COMMAND echo "${ARCHIVE_NAME}.tar.gz is ready for distribution."
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
)
- ADD_DEPENDENCIES(distcheck dist)
-ENDIF()
+ add_dependencies(distcheck dist)
+endif()
#ADD_CUSTOM_TARGET(uninstall
# COMMAND cat ${PROJECT_BINARY_DIR}/install_manifest.txt | xargs rm
# WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
# )
-IF(BUILD_SHARED_LIBS)
- SET(HAVE_SHARED TRUE)
-ELSE()
- SET(ZIP_STATIC TRUE)
-ENDIF()
+if(BUILD_SHARED_LIBS)
+ set(HAVE_SHARED TRUE)
+else()
+ set(ZIP_STATIC TRUE)
+endif()
# Checks
-CHECK_FUNCTION_EXISTS(_close HAVE__CLOSE)
-CHECK_FUNCTION_EXISTS(_dup HAVE__DUP)
-CHECK_FUNCTION_EXISTS(_fdopen HAVE__FDOPEN)
-CHECK_FUNCTION_EXISTS(_fileno HAVE__FILENO)
-CHECK_FUNCTION_EXISTS(_setmode HAVE__SETMODE)
-CHECK_FUNCTION_EXISTS(_snprintf HAVE__SNPRINTF)
-CHECK_FUNCTION_EXISTS(_strdup HAVE__STRDUP)
-CHECK_FUNCTION_EXISTS(_stricmp HAVE__STRICMP)
-CHECK_FUNCTION_EXISTS(_strtoi64 HAVE__STRTOI64)
-CHECK_FUNCTION_EXISTS(_strtoui64 HAVE__STRTOUI64)
-CHECK_FUNCTION_EXISTS(_unlink HAVE__UNLINK)
-CHECK_FUNCTION_EXISTS(arc4random HAVE_ARC4RANDOM)
-CHECK_FUNCTION_EXISTS(clonefile HAVE_CLONEFILE)
-CHECK_FUNCTION_EXISTS(explicit_bzero HAVE_EXPLICIT_BZERO)
-CHECK_FUNCTION_EXISTS(explicit_memset HAVE_EXPLICIT_MEMSET)
-CHECK_FUNCTION_EXISTS(fileno HAVE_FILENO)
-CHECK_FUNCTION_EXISTS(fseeko HAVE_FSEEKO)
-CHECK_FUNCTION_EXISTS(ftello HAVE_FTELLO)
-CHECK_FUNCTION_EXISTS(getprogname HAVE_GETPROGNAME)
-CHECK_FUNCTION_EXISTS(localtime_r HAVE_LOCALTIME_R)
-CHECK_FUNCTION_EXISTS(setmode HAVE_SETMODE)
-CHECK_FUNCTION_EXISTS(snprintf HAVE_SNPRINTF)
-CHECK_FUNCTION_EXISTS(strcasecmp HAVE_STRCASECMP)
-CHECK_FUNCTION_EXISTS(strdup HAVE_STRDUP)
-CHECK_FUNCTION_EXISTS(stricmp HAVE_STRICMP)
-CHECK_FUNCTION_EXISTS(strtoll HAVE_STRTOLL)
-CHECK_FUNCTION_EXISTS(strtoull HAVE_STRTOULL)
+check_function_exists(_close HAVE__CLOSE)
+check_function_exists(_dup HAVE__DUP)
+check_function_exists(_fdopen HAVE__FDOPEN)
+check_function_exists(_fileno HAVE__FILENO)
+check_function_exists(_setmode HAVE__SETMODE)
+check_function_exists(_snprintf HAVE__SNPRINTF)
+check_function_exists(_strdup HAVE__STRDUP)
+check_function_exists(_stricmp HAVE__STRICMP)
+check_function_exists(_strtoi64 HAVE__STRTOI64)
+check_function_exists(_strtoui64 HAVE__STRTOUI64)
+check_function_exists(_unlink HAVE__UNLINK)
+check_function_exists(arc4random HAVE_ARC4RANDOM)
+check_function_exists(clonefile HAVE_CLONEFILE)
+check_function_exists(explicit_bzero HAVE_EXPLICIT_BZERO)
+check_function_exists(explicit_memset HAVE_EXPLICIT_MEMSET)
+check_function_exists(fileno HAVE_FILENO)
+check_function_exists(fseeko HAVE_FSEEKO)
+check_function_exists(ftello HAVE_FTELLO)
+check_function_exists(getprogname HAVE_GETPROGNAME)
+check_function_exists(localtime_r HAVE_LOCALTIME_R)
+check_function_exists(setmode HAVE_SETMODE)
+check_function_exists(snprintf HAVE_SNPRINTF)
+check_function_exists(strcasecmp HAVE_STRCASECMP)
+check_function_exists(strdup HAVE_STRDUP)
+check_function_exists(stricmp HAVE_STRICMP)
+check_function_exists(strtoll HAVE_STRTOLL)
+check_function_exists(strtoull HAVE_STRTOULL)
-CHECK_INCLUDE_FILES("sys/types.h;sys/stat.h;fts.h" HAVE_FTS_H)
+check_include_files("sys/types.h;sys/stat.h;fts.h" HAVE_FTS_H)
# fts functions may be in external library
-IF(HAVE_FTS_H)
- CHECK_FUNCTION_EXISTS(fts_open HAVE_FTS_OPEN)
- IF(NOT HAVE_FTS_OPEN)
- CHECK_LIBRARY_EXISTS(fts fts_open "" HAVE_LIB_FTS)
- ELSE(NOT HAVE_FTS_OPEN)
- SET(HAVE_LIB_FTS "" CACHE INTERNAL "")
- ENDIF(NOT HAVE_FTS_OPEN)
-ELSE(HAVE_FTS_H)
- SET(HAVE_LIB_FTS "" CACHE INTERNAL "")
-ENDIF(HAVE_FTS_H)
+if(HAVE_FTS_H)
+ check_function_exists(fts_open HAVE_FTS_OPEN)
+ if(NOT HAVE_FTS_OPEN)
+ check_library_exists(fts fts_open "" HAVE_LIB_FTS)
+ else(NOT HAVE_FTS_OPEN)
+ set(HAVE_LIB_FTS "" CACHE INTERNAL "")
+ endif(NOT HAVE_FTS_OPEN)
+else(HAVE_FTS_H)
+ set(HAVE_LIB_FTS "" CACHE INTERNAL "")
+endif(HAVE_FTS_H)
-IF(HAVE_LIB_FTS)
- SET(FTS_LIB fts CACHE INTERNAL "")
-ELSE()
- SET(FTS_LIB "" CACHE INTERNAL "")
-ENDIF()
+if(HAVE_LIB_FTS)
+ set(FTS_LIB fts CACHE INTERNAL "")
+else()
+ set(FTS_LIB "" CACHE INTERNAL "")
+endif()
-CHECK_INCLUDE_FILES(stdbool.h HAVE_STDBOOL_H)
-CHECK_INCLUDE_FILES(strings.h HAVE_STRINGS_H)
-CHECK_INCLUDE_FILES(unistd.h HAVE_UNISTD_H)
+check_include_files(stdbool.h HAVE_STDBOOL_H)
+check_include_files(strings.h HAVE_STRINGS_H)
+check_include_files(unistd.h HAVE_UNISTD_H)
-CHECK_INCLUDE_FILES(inttypes.h HAVE_INTTYPES_H_LIBZIP)
-CHECK_INCLUDE_FILES(stdint.h HAVE_STDINT_H_LIBZIP)
-CHECK_INCLUDE_FILES(sys/types.h HAVE_SYS_TYPES_H_LIBZIP)
+check_include_files(inttypes.h HAVE_INTTYPES_H_LIBZIP)
+check_include_files(stdint.h HAVE_STDINT_H_LIBZIP)
+check_include_files(sys/types.h HAVE_SYS_TYPES_H_LIBZIP)
# TODO: fix test
# this test does not find __progname even when it exists
-#CHECK_SYMBOL_EXISTS(__progname stdlib.h HAVE___PROGNAME)
+#check_symbol_exists(__progname stdlib.h HAVE___PROGNAME)
-CHECK_TYPE_SIZE(__int8 __INT8_LIBZIP)
-CHECK_TYPE_SIZE(int8_t INT8_T_LIBZIP)
-CHECK_TYPE_SIZE(uint8_t UINT8_T_LIBZIP)
-CHECK_TYPE_SIZE(__int16 __INT16_LIBZIP)
-CHECK_TYPE_SIZE(int16_t INT16_T_LIBZIP)
-CHECK_TYPE_SIZE(uint16_t UINT16_T_LIBZIP)
-CHECK_TYPE_SIZE(__int32 __INT32_LIBZIP)
-CHECK_TYPE_SIZE(int32_t INT32_T_LIBZIP)
-CHECK_TYPE_SIZE(uint32_t UINT32_T_LIBZIP)
-CHECK_TYPE_SIZE(__int64 __INT64_LIBZIP)
-CHECK_TYPE_SIZE(int64_t INT64_T_LIBZIP)
-CHECK_TYPE_SIZE(uint64_t UINT64_T_LIBZIP)
-CHECK_TYPE_SIZE("short" SHORT_LIBZIP)
-CHECK_TYPE_SIZE("int" INT_LIBZIP)
-CHECK_TYPE_SIZE("long" LONG_LIBZIP)
-CHECK_TYPE_SIZE("long long" LONG_LONG_LIBZIP)
-CHECK_TYPE_SIZE("off_t" SIZEOF_OFF_T)
-CHECK_TYPE_SIZE("size_t" SIZE_T_LIBZIP)
-CHECK_TYPE_SIZE("ssize_t" SSIZE_T_LIBZIP)
+check_type_size(__int8 __INT8_LIBZIP)
+check_type_size(int8_t INT8_T_LIBZIP)
+check_type_size(uint8_t UINT8_T_LIBZIP)
+check_type_size(__int16 __INT16_LIBZIP)
+check_type_size(int16_t INT16_T_LIBZIP)
+check_type_size(uint16_t UINT16_T_LIBZIP)
+check_type_size(__int32 __INT32_LIBZIP)
+check_type_size(int32_t INT32_T_LIBZIP)
+check_type_size(uint32_t UINT32_T_LIBZIP)
+check_type_size(__int64 __INT64_LIBZIP)
+check_type_size(int64_t INT64_T_LIBZIP)
+check_type_size(uint64_t UINT64_T_LIBZIP)
+check_type_size("short" SHORT_LIBZIP)
+check_type_size("int" INT_LIBZIP)
+check_type_size("long" LONG_LIBZIP)
+check_type_size("long long" LONG_LONG_LIBZIP)
+check_type_size("off_t" SIZEOF_OFF_T)
+check_type_size("size_t" SIZE_T_LIBZIP)
+check_type_size("ssize_t" SSIZE_T_LIBZIP)
-CHECK_C_SOURCE_COMPILES("#include <sys/ioctl.h>
+check_c_source_compiles("#include <sys/ioctl.h>
#include <linux/fs.h>
int main(int argc, char *argv[]) { unsigned long x = FICLONERANGE; }" HAVE_FICLONERANGE)
-CHECK_C_SOURCE_COMPILES("
+check_c_source_compiles("
int foo(char * _Nullable bar);
int main(int argc, char *argv[]) { }" HAVE_NULLABLE)
-TEST_BIG_ENDIAN(WORDS_BIGENDIAN)
+test_big_endian(WORDS_BIGENDIAN)
-FIND_PACKAGE(ZLIB 1.1.2 REQUIRED)
-INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
-SET(CMAKE_REQUIRED_INCLUDES ${ZLIB_INCLUDE_DIR})
+find_package(ZLIB 1.1.2 REQUIRED)
+include_directories(${ZLIB_INCLUDE_DIR})
+set(CMAKE_REQUIRED_INCLUDES ${ZLIB_INCLUDE_DIR})
-IF(ENABLE_BZIP2)
- FIND_PACKAGE(BZip2)
- IF(BZIP2_FOUND)
- SET (HAVE_LIBBZ2 1)
+if(ENABLE_BZIP2)
+ find_package(BZip2)
+ if(BZIP2_FOUND)
+ set(HAVE_LIBBZ2 1)
- INCLUDE_DIRECTORIES(${BZIP2_INCLUDE_DIR})
- SET (OPTIONAL_LIBRARY ${OPTIONAL_LIBRARY} ${BZIP2_LIBRARIES})
- ELSE()
- MESSAGE(WARNING "-- bzip2 library not found; bzip2 support disabled")
- ENDIF(BZIP2_FOUND)
-ENDIF(ENABLE_BZIP2)
+ include_directories(${BZIP2_INCLUDE_DIR})
+ set(OPTIONAL_LIBRARY ${OPTIONAL_LIBRARY} ${BZIP2_LIBRARIES})
+ else()
+ message(WARNING "-- bzip2 library not found; bzip2 support disabled")
+ endif(BZIP2_FOUND)
+endif(ENABLE_BZIP2)
-IF(ENABLE_LZMA)
- FIND_PACKAGE(LibLZMA)
- IF(LIBLZMA_FOUND)
- SET (HAVE_LIBLZMA 1)
+if(ENABLE_LZMA)
+ find_package(LibLZMA)
+ if(LIBLZMA_FOUND)
+ set(HAVE_LIBLZMA 1)
- INCLUDE_DIRECTORIES(${LIBLZMA_INCLUDE_DIR})
- SET (OPTIONAL_LIBRARY ${OPTIONAL_LIBRARY} ${LIBLZMA_LIBRARY})
- ELSE()
- MESSAGE(WARNING "-- lzma library not found; lzma support disabled")
- ENDIF(LIBLZMA_FOUND)
-ENDIF(ENABLE_LZMA)
+ include_directories(${LIBLZMA_INCLUDE_DIR})
+ set(OPTIONAL_LIBRARY ${OPTIONAL_LIBRARY} ${LIBLZMA_LIBRARY})
+ else()
+ message(WARNING "-- lzma library not found; lzma support disabled")
+ endif(LIBLZMA_FOUND)
+endif(ENABLE_LZMA)
-IF (COMMONCRYPTO_FOUND)
- SET (HAVE_CRYPTO 1)
- SET (HAVE_COMMONCRYPTO 1)
-ELSEIF (WINDOWS_CRYPTO_FOUND)
- SET (HAVE_CRYPTO 1)
- SET (HAVE_WINDOWS_CRYPTO 1)
-ELSEIF (GNUTLS_FOUND AND NETTLE_FOUND)
- SET (HAVE_CRYPTO 1)
- SET (HAVE_GNUTLS 1)
- INCLUDE_DIRECTORIES(${GNUTLS_INCLUDE_DIR} ${NETTLE_INCLUDE_DIR})
- SET (OPTIONAL_LIBRARY ${OPTIONAL_LIBRARY} ${GNUTLS_LIBRARY} ${NETTLE_LIBRARY})
-ELSEIF (OPENSSL_FOUND)
- SET (HAVE_CRYPTO 1)
- SET (HAVE_OPENSSL 1)
- INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR})
- SET (OPTIONAL_LIBRARY ${OPTIONAL_LIBRARY} ${OPENSSL_LIBRARIES})
-ELSEIF (MBEDTLS_LIBRARIES)
- SET (HAVE_CRYPTO 1)
- SET (HAVE_MBEDTLS 1)
- INCLUDE_DIRECTORIES(${MBEDTLS_INCLUDE_DIR})
- SET (OPTIONAL_LIBRARY ${OPTIONAL_LIBRARY} ${MBEDTLS_LIBRARIES})
-ENDIF()
+if (COMMONCRYPTO_FOUND)
+ set(HAVE_CRYPTO 1)
+ set(HAVE_COMMONCRYPTO 1)
+elseif (WINDOWS_CRYPTO_FOUND)
+ set(HAVE_CRYPTO 1)
+ set(HAVE_WINDOWS_CRYPTO 1)
+elseif (GNUTLS_FOUND AND NETTLE_FOUND)
+ set(HAVE_CRYPTO 1)
+ set(HAVE_GNUTLS 1)
+ include_directories(${GNUTLS_INCLUDE_DIR} ${NETTLE_INCLUDE_DIR})
+ set(OPTIONAL_LIBRARY ${OPTIONAL_LIBRARY} ${GNUTLS_LIBRARY} ${NETTLE_LIBRARY})
+elseif (OPENSSL_FOUND)
+ set(HAVE_CRYPTO 1)
+ set(HAVE_OPENSSL 1)
+ include_directories(${OPENSSL_INCLUDE_DIR})
+ set(OPTIONAL_LIBRARY ${OPTIONAL_LIBRARY} ${OPENSSL_LIBRARIES})
+elseif (MBEDTLS_LIBRARIES)
+ set(HAVE_CRYPTO 1)
+ set(HAVE_MBEDTLS 1)
+ include_directories(${MBEDTLS_INCLUDE_DIR})
+ set(OPTIONAL_LIBRARY ${OPTIONAL_LIBRARY} ${MBEDTLS_LIBRARIES})
+endif()
-IF (NOT HAVE_CRYPTO)
- MESSAGE(WARNING "-- neither Common Crypto, GnuTLS, mbed TLS, OpenSSL, nor Windows Cryptography found; AES support disabled")
-ENDIF()
+if (NOT HAVE_CRYPTO)
+ message(WARNING "-- neither Common Crypto, GnuTLS, mbed TLS, OpenSSL, nor Windows Cryptography found; AES support disabled")
+endif()
-IF(MSVC)
+if(MSVC)
ADD_DEFINITIONS("-D_CRT_SECURE_NO_WARNINGS")
ADD_DEFINITIONS("-D_CRT_NONSTDC_NO_DEPRECATE")
-ENDIF(MSVC)
+endif(MSVC)
if(WIN32)
if(HAVE_WINDOWS_CRYPTO)
- SET (OPTIONAL_LIBRARY ${OPTIONAL_LIBRARY} bcrypt)
+ set(OPTIONAL_LIBRARY ${OPTIONAL_LIBRARY} bcrypt)
endif()
if(CMAKE_SYSTEM_NAME MATCHES WindowsPhone OR CMAKE_SYSTEM_NAME MATCHES WindowsStore)
ADD_DEFINITIONS(-DMS_UWP)
else(CMAKE_SYSTEM_NAME MATCHES WindowsPhone OR CMAKE_SYSTEM_NAME MATCHES WindowsStore)
- SET (OPTIONAL_LIBRARY ${OPTIONAL_LIBRARY} advapi32)
+ set(OPTIONAL_LIBRARY ${OPTIONAL_LIBRARY} advapi32)
endif(CMAKE_SYSTEM_NAME MATCHES WindowsPhone OR CMAKE_SYSTEM_NAME MATCHES WindowsStore)
endif(WIN32)
ADD_DEFINITIONS("-DHAVE_CONFIG_H")
# rpath handling: use rpath in installed binaries
-IF(NOT CMAKE_SYSTEM_NAME MATCHES Linux)
- SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
- SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-ENDIF()
+if(NOT CMAKE_SYSTEM_NAME MATCHES Linux)
+ set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
+ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+endif()
# for code completion frameworks
-SET(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
# Testing
ENABLE_TESTING()
@@ -299,44 +299,44 @@
# Targets
ADD_SUBDIRECTORY(lib)
-IF(BUILD_DOC)
+if(BUILD_DOC)
ADD_SUBDIRECTORY(man)
-ENDIF()
+endif()
-IF(BUILD_TOOLS)
+if(BUILD_TOOLS)
ADD_SUBDIRECTORY(src)
-ELSE(BUILD_TOOLS)
- IF(BUILD_REGRESS)
- MESSAGE(WARNING "-- tools build has been disabled, but they are needed for regression tests; regression testing disabled")
- SET(BUILD_REGRESS OFF)
- ENDIF(BUILD_REGRESS)
-ENDIF()
+else(BUILD_TOOLS)
+ if(BUILD_REGRESS)
+ message(WARNING "-- tools build has been disabled, but they are needed for regression tests; regression testing disabled")
+ set(BUILD_REGRESS OFF)
+ endif(BUILD_REGRESS)
+endif()
-INCLUDE(FindPerl)
+include(FindPerl)
-IF(NOT PERL_FOUND)
- MESSAGE(WARNING "-- perl not found, regression testing disabled")
- SET(BUILD_REGRESS OFF)
-ENDIF()
+if(NOT PERL_FOUND)
+ message(WARNING "-- perl not found, regression testing disabled")
+ set(BUILD_REGRESS OFF)
+endif()
-IF(BUILD_REGRESS)
- ADD_SUBDIRECTORY(regress)
-ENDIF()
+if(BUILD_REGRESS)
+ add_subdirectory(regress)
+endif()
-IF(BUILD_EXAMPLES)
- ADD_SUBDIRECTORY(examples)
-ENDIF()
+if(BUILD_EXAMPLES)
+ add_subdirectory(examples)
+endif()
# pkgconfig file
-SET(prefix ${CMAKE_INSTALL_PREFIX})
-SET(exec_prefix \${prefix})
-SET(bindir \${exec_prefix}/${CMAKE_INSTALL_BINDIR})
-SET(libdir \${exec_prefix}/${CMAKE_INSTALL_LIBDIR})
-SET(includedir \${prefix}/${CMAKE_INSTALL_INCLUDEDIR})
-IF(CMAKE_SYSTEM_NAME MATCHES BSD)
- SET(PKG_CONFIG_RPATH "-Wl,-R\${libdir}")
-ENDIF(CMAKE_SYSTEM_NAME MATCHES BSD)
+set(prefix ${CMAKE_INSTALL_PREFIX})
+set(exec_prefix \${prefix})
+set(bindir \${exec_prefix}/${CMAKE_INSTALL_BINDIR})
+set(libdir \${exec_prefix}/${CMAKE_INSTALL_LIBDIR})
+set(includedir \${prefix}/${CMAKE_INSTALL_INCLUDEDIR})
+if(CMAKE_SYSTEM_NAME MATCHES BSD)
+ set(PKG_CONFIG_RPATH "-Wl,-R\${libdir}")
+endif(CMAKE_SYSTEM_NAME MATCHES BSD)
get_target_property(LIBS_PRIVATE zip LINK_LIBRARIES)
foreach(LIB ${LIBS_PRIVATE})
if(LIB MATCHES "^/")
@@ -345,120 +345,120 @@
endif()
set(LIBS "${LIBS} -l${LIB}")
endforeach()
-CONFIGURE_FILE(libzip.pc.in libzip.pc @ONLY)
-IF(LIBZIP_DO_INSTALL)
- INSTALL(FILES ${PROJECT_BINARY_DIR}/libzip.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
-ENDIF()
+configure_file(libzip.pc.in libzip.pc @ONLY)
+if(LIBZIP_DO_INSTALL)
+ install(FILES ${PROJECT_BINARY_DIR}/libzip.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+endif()
# fixed size integral types
-IF(HAVE_INTTYPES_H_LIBZIP)
- SET(LIBZIP_TYPES_INCLUDE "#if !defined(__STDC_FORMAT_MACROS)
+if(HAVE_INTTYPES_H_LIBZIP)
+ set(LIBZIP_TYPES_INCLUDE "#if !defined(__STDC_FORMAT_MACROS)
#define __STDC_FORMAT_MACROS 1
#endif
#include <inttypes.h>")
-ELSEIF(HAVE_STDINT_H_LIBZIP)
- SET(LIBZIP_TYPES_INCLUDE "#include <stdint.h>")
-ELSEIF(HAVE_SYS_TYPES_H_LIBZIP)
- SET(LIBZIP_TYPES_INCLUDE "#include <sys/types.h>")
-ENDIF()
+elseif(HAVE_STDINT_H_LIBZIP)
+ set(LIBZIP_TYPES_INCLUDE "#include <stdint.h>")
+elseif(HAVE_SYS_TYPES_H_LIBZIP)
+ set(LIBZIP_TYPES_INCLUDE "#include <sys/types.h>")
+endif()
-IF(HAVE_INT8_T_LIBZIP)
- SET(ZIP_INT8_T int8_t)
-ELSEIF(HAVE___INT8_LIBZIP)
- SET(ZIP_INT8_T __int8)
-ELSE()
- SET(ZIP_INT8_T "signed char")
-ENDIF()
+if(HAVE_INT8_T_LIBZIP)
+ set(ZIP_INT8_T int8_t)
+elseif(HAVE___INT8_LIBZIP)
+ set(ZIP_INT8_T __int8)
+else()
+ set(ZIP_INT8_T "signed char")
+endif()
-IF(HAVE_UINT8_T_LIBZIP)
- SET(ZIP_UINT8_T uint8_t)
-ELSEIF(HAVE___INT8_LIBZIP)
- SET(ZIP_UINT8_T "unsigned __int8")
-ELSE()
- SET(ZIP_UINT8_T "unsigned char")
-ENDIF()
+if(HAVE_UINT8_T_LIBZIP)
+ set(ZIP_UINT8_T uint8_t)
+elseif(HAVE___INT8_LIBZIP)
+ set(ZIP_UINT8_T "unsigned __int8")
+else()
+ set(ZIP_UINT8_T "unsigned char")
+endif()
-IF(HAVE_INT16_T_LIBZIP)
- SET(ZIP_INT16_T int16_t)
-ELSEIF(HAVE___INT16_LIBZIP)
- SET(INT16_T_LIBZIP __int16)
-ELSEIF(SHORT_LIBZIP EQUAL 2)
- SET(INT16_T_LIBZIP short)
-ENDIF()
+if(HAVE_INT16_T_LIBZIP)
+ set(ZIP_INT16_T int16_t)
+elseif(HAVE___INT16_LIBZIP)
+ set(INT16_T_LIBZIP __int16)
+elseif(SHORT_LIBZIP EQUAL 2)
+ set(INT16_T_LIBZIP short)
+endif()
-IF(HAVE_UINT16_T_LIBZIP)
- SET(ZIP_UINT16_T uint16_t)
-ELSEIF(HAVE___INT16_LIBZIP)
- SET(UINT16_T_LIBZIP "unsigned __int16")
-ELSEIF(SHORT_LIBZIP EQUAL 2)
- SET(UINT16_T_LIBZIP "unsigned short")
-ENDIF()
+if(HAVE_UINT16_T_LIBZIP)
+ set(ZIP_UINT16_T uint16_t)
+elseif(HAVE___INT16_LIBZIP)
+ set(UINT16_T_LIBZIP "unsigned __int16")
+elseif(SHORT_LIBZIP EQUAL 2)
+ set(UINT16_T_LIBZIP "unsigned short")
+endif()
-IF(HAVE_INT32_T_LIBZIP)
- SET(ZIP_INT32_T int32_t)
-ELSEIF(HAVE___INT32_LIBZIP)
- SET(ZIP_INT32_T __int32)
-ELSEIF(INT_LIBZIP EQUAL 4)
- SET(ZIP_INT32_T int)
-ELSEIF(LONG_LIBZIP EQUAL 4)
- SET(ZIP_INT32_T long)
-ENDIF()
+if(HAVE_INT32_T_LIBZIP)
+ set(ZIP_INT32_T int32_t)
+elseif(HAVE___INT32_LIBZIP)
+ set(ZIP_INT32_T __int32)
+elseif(INT_LIBZIP EQUAL 4)
+ set(ZIP_INT32_T int)
+elseif(LONG_LIBZIP EQUAL 4)
+ set(ZIP_INT32_T long)
+endif()
-IF(HAVE_UINT32_T_LIBZIP)
- SET(ZIP_UINT32_T uint32_t)
-ELSEIF(HAVE___INT32_LIBZIP)
- SET(ZIP_UINT32_T "unsigned __int32")
-ELSEIF(INT_LIBZIP EQUAL 4)
- SET(ZIP_UINT32_T "unsigned int")
-ELSEIF(LONG_LIBZIP EQUAL 4)
- SET(ZIP_UINT32_T "unsigned long")
-ENDIF()
+if(HAVE_UINT32_T_LIBZIP)
+ set(ZIP_UINT32_T uint32_t)
+elseif(HAVE___INT32_LIBZIP)
+ set(ZIP_UINT32_T "unsigned __int32")
+elseif(INT_LIBZIP EQUAL 4)
+ set(ZIP_UINT32_T "unsigned int")
+elseif(LONG_LIBZIP EQUAL 4)
+ set(ZIP_UINT32_T "unsigned long")
+endif()
-IF(HAVE_INT64_T_LIBZIP)
- SET(ZIP_INT64_T int64_t)
-ELSEIF(HAVE___INT64_LIBZIP)
- SET(ZIP_INT64_T __int64)
-ELSEIF(LONG_LIBZIP EQUAL 8)
- SET(ZIP_INT64_T long)
-ELSEIF(LONG_LONG_LIBZIP EQUAL 8)
- SET(ZIP_INT64_T "long long")
-ENDIF()
+if(HAVE_INT64_T_LIBZIP)
+ set(ZIP_INT64_T int64_t)
+elseif(HAVE___INT64_LIBZIP)
+ set(ZIP_INT64_T __int64)
+elseif(LONG_LIBZIP EQUAL 8)
+ set(ZIP_INT64_T long)
+elseif(LONG_LONG_LIBZIP EQUAL 8)
+ set(ZIP_INT64_T "long long")
+endif()
-IF(HAVE_UINT64_T_LIBZIP)
- SET(ZIP_UINT64_T uint64_t)
-ELSEIF(HAVE___INT64_LIBZIP)
- SET(ZIP_UINT64_T "unsigned __int64")
-ELSEIF(LONG_LIBZIP EQUAL 8)
- SET(ZIP_UINT64_T "unsigned long")
-ELSEIF(LONG_LONG_LIBZIP EQUAL 8)
- SET(ZIP_UINT64_T "unsigned long long")
-ENDIF()
+if(HAVE_UINT64_T_LIBZIP)
+ set(ZIP_UINT64_T uint64_t)
+elseif(HAVE___INT64_LIBZIP)
+ set(ZIP_UINT64_T "unsigned __int64")
+elseif(LONG_LIBZIP EQUAL 8)
+ set(ZIP_UINT64_T "unsigned long")
+elseif(LONG_LONG_LIBZIP EQUAL 8)
+ set(ZIP_UINT64_T "unsigned long long")
+endif()
-IF(HAVE_NULLABLE)
- SET(ZIP_NULLABLE_DEFINES)
-ELSE()
- SET(ZIP_NULLABLE_DEFINES "#define _Nullable
+if(HAVE_NULLABLE)
+ set(ZIP_NULLABLE_DEFINES)
+else()
+ set(ZIP_NULLABLE_DEFINES "#define _Nullable
#define _Nonnull")
-ENDIF()
+endif()
# write out config file
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake-config.h.in ${PROJECT_BINARY_DIR}/config.h)
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake-zipconf.h.in ${PROJECT_BINARY_DIR}/zipconf.h)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake-config.h.in ${PROJECT_BINARY_DIR}/config.h)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake-zipconf.h.in ${PROJECT_BINARY_DIR}/zipconf.h)
# for tests
-SET(srcdir ${CMAKE_CURRENT_SOURCE_DIR}/regress)
-SET(abs_srcdir ${CMAKE_CURRENT_SOURCE_DIR}/regress)
-SET(top_builddir ${PROJECT_BINARY_DIR}) # used to find config.h
+set(srcdir ${CMAKE_CURRENT_SOURCE_DIR}/regress)
+set(abs_srcdir ${CMAKE_CURRENT_SOURCE_DIR}/regress)
+set(top_builddir ${PROJECT_BINARY_DIR}) # used to find config.h
-CONFIGURE_FILE(regress/nihtest.conf.in ${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/nihtest.conf @ONLY)
-FILE(COPY ${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/nihtest.conf
+configure_file(regress/nihtest.conf.in ${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/nihtest.conf @ONLY)
+file(COPY ${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/nihtest.conf
DESTINATION ${PROJECT_BINARY_DIR}/regress
FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-CONFIGURE_FILE(regress/runtest.in ${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/runtest @ONLY)
-FILE(COPY ${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/runtest
+configure_file(regress/runtest.in ${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/runtest @ONLY)
+file(COPY ${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/runtest
DESTINATION ${PROJECT_BINARY_DIR}/regress
FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
)
@@ -471,30 +471,30 @@
)
# create package config file
-INCLUDE(CMakePackageConfigHelpers)
-WRITE_BASIC_PACKAGE_VERSION_FILE("${PROJECT_BINARY_DIR}/libzip-version.cmake"
+include(CMakePackageConfigHelpers)
+write_basic_package_version_file("${PROJECT_BINARY_DIR}/libzip-version.cmake"
COMPATIBILITY AnyNewerVersion)
-CONFIGURE_PACKAGE_CONFIG_FILE("${PROJECT_NAME}.cmake.in" "${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
+configure_package_config_file("${PROJECT_NAME}.cmake.in" "${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libzip
PATH_VARS CMAKE_INSTALL_BINDIR CMAKE_INSTALL_INCLUDEDIR CMAKE_INSTALL_LIBDIR)
-IF(LIBZIP_DO_INSTALL)
- INSTALL(EXPORT ${PROJECT_NAME}-targets
+if(LIBZIP_DO_INSTALL)
+ install(EXPORT ${PROJECT_NAME}-targets
FILE ${PROJECT_NAME}-targets.cmake
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
)
-ENDIF()
+endif()
# Add targets to the build-tree export set
EXPORT(TARGETS zip
FILE "${PROJECT_BINARY_DIR}/${PROJECT_NAME}-targets.cmake")
# installation
-IF(LIBZIP_DO_INSTALL)
- INSTALL(FILES ${PROJECT_BINARY_DIR}/zipconf.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
- INSTALL(FILES ${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config.cmake ${PROJECT_BINARY_DIR}/${PROJECT_NAME}-version.cmake
+if(LIBZIP_DO_INSTALL)
+ install(FILES ${PROJECT_BINARY_DIR}/zipconf.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ install(FILES ${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config.cmake ${PROJECT_BINARY_DIR}/${PROJECT_NAME}-version.cmake
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
)
-ENDIF()
+endif()
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 6fcdd05..452001c 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -1,13 +1,13 @@
-CHECK_FUNCTION_EXISTS(getopt HAVE_GETOPT)
-IF(NOT HAVE_GETOPT)
- SET(SRC_EXTRA_FILES ../src/getopt.c)
-INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/examples
+check_function_exists(getopt HAVE_GETOPT)
+if(NOT HAVE_GETOPT)
+ set(SRC_EXTRA_FILES ../src/getopt.c)
+include_directories(${PROJECT_SOURCE_DIR}/examples
${PROJECT_SOURCE_DIR}/src)
-ENDIF(NOT HAVE_GETOPT)
+endif(NOT HAVE_GETOPT)
-ADD_EXECUTABLE(in-memory in-memory.c)
-TARGET_LINK_LIBRARIES(in-memory zip)
+add_executable(in-memory in-memory.c)
+target_link_libraries(in-memory zip)
-INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/lib
+include_directories(${PROJECT_SOURCE_DIR}/lib
${PROJECT_SOURCE_DIR}/src
${PROJECT_BINARY_DIR})
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index a68360c..103f17e 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -1,12 +1,12 @@
-INCLUDE(CheckFunctionExists)
+include(CheckFunctionExists)
-IF(LIBZIP_DO_INSTALL)
- INSTALL(FILES zip.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-ENDIF()
+if(LIBZIP_DO_INSTALL)
+ install(FILES zip.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+endif()
-SET(CMAKE_C_VISIBILITY_PRESET hidden)
+set(CMAKE_C_VISIBILITY_PRESET hidden)
-SET(LIBZIP_SOURCES
+set(LIBZIP_SOURCES
zip_add.c
zip_add_dir.c
zip_add_entry.c
@@ -118,32 +118,32 @@
zip_utf-8.c
)
-IF(WIN32)
- SET(LIBZIP_OPSYS_FILES
+if(WIN32)
+ set(LIBZIP_OPSYS_FILES
zip_source_file_win32.c
zip_source_file_win32_named.c
zip_source_file_win32_utf16.c
zip_source_file_win32_utf8.c
)
- IF(CMAKE_SYSTEM_NAME MATCHES WindowsPhone OR CMAKE_SYSTEM_NAME MATCHES WindowsStore)
- SET(LIBZIP_OPSYS_FILES "${LIBZIP_OPSYS_FILES}"
+ if(CMAKE_SYSTEM_NAME MATCHES WindowsPhone OR CMAKE_SYSTEM_NAME MATCHES WindowsStore)
+ set(LIBZIP_OPSYS_FILES "${LIBZIP_OPSYS_FILES}"
zip_random_uwp.c
)
- ELSE()
- SET(LIBZIP_OPSYS_FILES "${LIBZIP_OPSYS_FILES}"
+ else()
+ set(LIBZIP_OPSYS_FILES "${LIBZIP_OPSYS_FILES}"
zip_source_file_win32_ansi.c
zip_random_win32.c
)
- ENDIF()
-ELSE(WIN32)
- SET(LIBZIP_OPSYS_FILES
+ endif()
+else(WIN32)
+ set(LIBZIP_OPSYS_FILES
zip_mkstempm.c
zip_source_file_stdio_named.c
zip_random_unix.c
)
-ENDIF(WIN32)
+endif(WIN32)
-INCLUDE_DIRECTORIES(BEFORE ${PROJECT_SOURCE_DIR}/lib ${PROJECT_BINARY_DIR})
+include_directories(BEFORE ${PROJECT_SOURCE_DIR}/lib ${PROJECT_BINARY_DIR})
file(READ ${PROJECT_SOURCE_DIR}/lib/zip.h zip_h)
string(REGEX MATCHALL "#define ZIP_ER_([A-Z_]+) ([0-9]+)[ \t]+/([-*0-9a-zA-Z ']*)/" zip_h_err ${zip_h})
@@ -179,49 +179,49 @@
file(WRITE ${CMAKE_BINARY_DIR}/zip_err_str.c ${zip_err_str})
list(APPEND LIBZIP_SOURCES ${CMAKE_BINARY_DIR}/zip_err_str.c)
-IF(HAVE_LIBBZ2)
- SET(LIBZIP_OPTIONAL_FILES zip_algorithm_bzip2.c)
-ENDIF()
+if(HAVE_LIBBZ2)
+ set(LIBZIP_OPTIONAL_FILES zip_algorithm_bzip2.c)
+endif()
-IF(HAVE_LIBLZMA)
- SET(LIBZIP_OPTIONAL_FILES ${LIBZIP_OPTIONAL_FILES} zip_algorithm_xz.c)
-ENDIF()
+if(HAVE_LIBLZMA)
+ set(LIBZIP_OPTIONAL_FILES ${LIBZIP_OPTIONAL_FILES} zip_algorithm_xz.c)
+endif()
-IF(HAVE_COMMONCRYPTO)
- SET(LIBZIP_OPTIONAL_FILES ${LIBZIP_OPTIONAL_FILES} zip_crypto_commoncrypto.c
+if(HAVE_COMMONCRYPTO)
+ set(LIBZIP_OPTIONAL_FILES ${LIBZIP_OPTIONAL_FILES} zip_crypto_commoncrypto.c
)
-ELSEIF(HAVE_WINDOWS_CRYPTO)
- SET(LIBZIP_OPTIONAL_FILES ${LIBZIP_OPTIONAL_FILES} zip_crypto_win.c
+elseif(HAVE_WINDOWS_CRYPTO)
+ set(LIBZIP_OPTIONAL_FILES ${LIBZIP_OPTIONAL_FILES} zip_crypto_win.c
)
-ELSEIF(HAVE_GNUTLS)
- SET(LIBZIP_OPTIONAL_FILES ${LIBZIP_OPTIONAL_FILES} zip_crypto_gnutls.c
+elseif(HAVE_GNUTLS)
+ set(LIBZIP_OPTIONAL_FILES ${LIBZIP_OPTIONAL_FILES} zip_crypto_gnutls.c
)
-ELSEIF(HAVE_OPENSSL)
- SET(LIBZIP_OPTIONAL_FILES ${LIBZIP_OPTIONAL_FILES} zip_crypto_openssl.c
+elseif(HAVE_OPENSSL)
+ set(LIBZIP_OPTIONAL_FILES ${LIBZIP_OPTIONAL_FILES} zip_crypto_openssl.c
)
-ELSEIF(HAVE_MBEDTLS)
- SET(LIBZIP_OPTIONAL_FILES ${LIBZIP_OPTIONAL_FILES} zip_crypto_mbedtls.c
+elseif(HAVE_MBEDTLS)
+ set(LIBZIP_OPTIONAL_FILES ${LIBZIP_OPTIONAL_FILES} zip_crypto_mbedtls.c
)
-ENDIF()
+endif()
-IF(HAVE_CRYPTO)
- SET(LIBZIP_OPTIONAL_FILES ${LIBZIP_OPTIONAL_FILES} zip_winzip_aes.c zip_source_winzip_aes_decode.c zip_source_winzip_aes_encode.c
+if(HAVE_CRYPTO)
+ set(LIBZIP_OPTIONAL_FILES ${LIBZIP_OPTIONAL_FILES} zip_winzip_aes.c zip_source_winzip_aes_decode.c zip_source_winzip_aes_encode.c
)
-ENDIF()
+endif()
-ADD_LIBRARY(zip ${LIBZIP_SOURCES} ${LIBZIP_EXTRA_FILES} ${LIBZIP_OPTIONAL_FILES} ${LIBZIP_OPSYS_FILES})
+add_library(zip ${LIBZIP_SOURCES} ${LIBZIP_EXTRA_FILES} ${LIBZIP_OPTIONAL_FILES} ${LIBZIP_OPSYS_FILES})
-IF(SHARED_LIB_VERSIONNING)
-SET_TARGET_PROPERTIES(zip PROPERTIES VERSION 5.3 SOVERSION 5)
-ENDIF()
+if(SHARED_LIB_VERSIONNING)
+ set_target_properties(zip PROPERTIES VERSION 5.3 SOVERSION 5)
+endif()
-TARGET_LINK_LIBRARIES(zip PRIVATE ${ZLIB_LIBRARIES} ${OPTIONAL_LIBRARY})
+target_link_libraries(zip PRIVATE ${ZLIB_LIBRARIES} ${OPTIONAL_LIBRARY})
-IF(LIBZIP_DO_INSTALL)
- INSTALL(TARGETS zip
+if(LIBZIP_DO_INSTALL)
+ install(TARGETS zip
EXPORT ${PROJECT_NAME}-targets
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-ENDIF()
+endif()
diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt
index 5290f88..e07b5ac 100644
--- a/man/CMakeLists.txt
+++ b/man/CMakeLists.txt
@@ -1,4 +1,4 @@
-SET(MAN_PAGES
+set(MAN_PAGES
ZIP_SOURCE_GET_ARGS.3
libzip.3
zip_add.3
@@ -100,62 +100,62 @@
ziptool.1
)
-FOREACH(MAN_PAGE ${MAN_PAGES})
- STRING(REGEX REPLACE "[1-9]$" "${DOCUMENTATION_FORMAT}" SOURCE_FILE ${MAN_PAGE})
- IF(LIBZIP_DO_INSTALL)
- IF (DOCUMENTATION_FORMAT MATCHES "html")
- INSTALL(FILES ${PROJECT_BINARY_DIR}/man/${MAN_PAGE} DESTINATION ${CMAKE_INSTALL_DOCDIR} RENAME ${SOURCE_FILE})
- ELSE()
- STRING(REGEX REPLACE ".*(.)$" "man\\1" SUBDIR ${MAN_PAGE})
- INSTALL(FILES ${PROJECT_BINARY_DIR}/man/${MAN_PAGE} DESTINATION ${CMAKE_INSTALL_MANDIR}/${SUBDIR})
- ENDIF()
- ENDIF()
- # CONFIGURE_FILE does not find out about updates to the sources, and it does not provide a target
- #CONFIGURE_FILE(${SOURCE_FILE} ${MAN_PAGE} COPYONLY)
- ADD_CUSTOM_COMMAND(OUTPUT ${MAN_PAGE}
+foreach(MAN_PAGE ${MAN_PAGES})
+ string(REGEX REPLACE "[1-9]$" "${DOCUMENTATION_FORMAT}" SOURCE_FILE ${MAN_PAGE})
+ if(LIBZIP_DO_INSTALL)
+ if (DOCUMENTATION_FORMAT MATCHES "html")
+ install(FILES ${PROJECT_BINARY_DIR}/man/${MAN_PAGE} DESTINATION ${CMAKE_INSTALL_DOCDIR} RENAME ${SOURCE_FILE})
+ else()
+ string(REGEX REPLACE ".*(.)$" "man\\1" SUBDIR ${MAN_PAGE})
+ install(FILES ${PROJECT_BINARY_DIR}/man/${MAN_PAGE} DESTINATION ${CMAKE_INSTALL_MANDIR}/${SUBDIR})
+ endif()
+ endif()
+ # configure_file does not find out about updates to the sources, and it does not provide a target
+ #configure_file(${SOURCE_FILE} ${MAN_PAGE} COPYONLY)
+ add_custom_command(OUTPUT ${MAN_PAGE}
DEPENDS ${SOURCE_FILE}
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${PROJECT_SOURCE_DIR}/man/${SOURCE_FILE} ${PROJECT_BINARY_DIR}/man/${MAN_PAGE}
COMMENT "Preparing ${MAN_PAGE}"
)
- STRING(REGEX REPLACE "[1-9]$" "html" HTML_FILE ${MAN_PAGE})
- STRING(REGEX REPLACE "[1-9]$" "man" MAN_FILE ${MAN_PAGE})
- STRING(REGEX REPLACE "[1-9]$" "mdoc" MDOC_FILE ${MAN_PAGE})
+ string(REGEX REPLACE "[1-9]$" "html" HTML_FILE ${MAN_PAGE})
+ string(REGEX REPLACE "[1-9]$" "man" MAN_FILE ${MAN_PAGE})
+ string(REGEX REPLACE "[1-9]$" "mdoc" MDOC_FILE ${MAN_PAGE})
# html re-generation
- ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_SOURCE_DIR}/man/${HTML_FILE}
+ add_custom_command(OUTPUT ${PROJECT_SOURCE_DIR}/man/${HTML_FILE}
DEPENDS ${MDOC_FILE}
COMMAND ${CMAKE_COMMAND} -DIN=${MDOC_FILE} -DOUT=${HTML_FILE} -DDIR=${PROJECT_SOURCE_DIR}/man -P ${PROJECT_SOURCE_DIR}/man/update-html.cmake
)
- LIST(APPEND UPDATEHTML ${PROJECT_SOURCE_DIR}/man/${HTML_FILE})
+ list(APPEND UPDATEHTML ${PROJECT_SOURCE_DIR}/man/${HTML_FILE})
# man re-generation
- ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_SOURCE_DIR}/man/${MAN_FILE}
+ add_custom_command(OUTPUT ${PROJECT_SOURCE_DIR}/man/${MAN_FILE}
DEPENDS ${MDOC_FILE}
COMMAND ${CMAKE_COMMAND} -DIN=${MDOC_FILE} -DOUT=${MAN_FILE} -DDIR=${PROJECT_SOURCE_DIR}/man -P ${PROJECT_SOURCE_DIR}/man/update-man.cmake
)
- LIST(APPEND UPDATEMAN ${PROJECT_SOURCE_DIR}/man/${MAN_FILE})
-ENDFOREACH()
-ADD_CUSTOM_TARGET(man ALL DEPENDS ${MAN_PAGES})
-ADD_CUSTOM_TARGET(update-man DEPENDS ${UPDATEMAN})
-ADD_CUSTOM_TARGET(update-html DEPENDS ${UPDATEHTML})
+ list(APPEND UPDATEMAN ${PROJECT_SOURCE_DIR}/man/${MAN_FILE})
+endforeach()
+add_custom_target(man ALL DEPENDS ${MAN_PAGES})
+add_custom_target(update-man DEPENDS ${UPDATEMAN})
+add_custom_target(update-html DEPENDS ${UPDATEHTML})
-FILE(STRINGS links MANPAGE_LINKS)
-FOREACH(LINKS_LINE ${MANPAGE_LINKS})
- IF(${LINKS_LINE} MATCHES "(.*) (.*)")
- SET(SOURCE ${CMAKE_MATCH_1})
- SET(TARGET ${CMAKE_MATCH_2})
- IF(LIBZIP_DO_INSTALL)
- IF (DOCUMENTATION_FORMAT MATCHES "html")
+file(STRINGS links MANPAGE_LINKS)
+foreach(LINKS_LINE ${MANPAGE_LINKS})
+ if(${LINKS_LINE} MATCHES "(.*) (.*)")
+ set(SOURCE ${CMAKE_MATCH_1})
+ set(TARGET ${CMAKE_MATCH_2})
+ if(LIBZIP_DO_INSTALL)
+ if (DOCUMENTATION_FORMAT MATCHES "html")
INSTALL(FILES ${PROJECT_BINARY_DIR}/man/${SOURCE}.3 DESTINATION ${CMAKE_INSTALL_DOCDIR} RENAME ${TARGET}.html)
- ELSE()
+ else()
INSTALL(FILES ${PROJECT_BINARY_DIR}/man/${SOURCE}.3 DESTINATION ${CMAKE_INSTALL_MANDIR}/man3 RENAME ${TARGET}.3)
- ENDIF()
- ENDIF()
- ENDIF()
-ENDFOREACH()
+ endif()
+ endif()
+ endif()
+endforeach()
-ADD_CUSTOM_TARGET(update_zip_errors
+add_custom_target(update_zip_errors
COMMAND sh ${PROJECT_SOURCE_DIR}/man/make_zip_errors.sh ${CMAKE_SOURCE_DIR}/lib/zip.h ${PROJECT_SOURCE_DIR}/man/zip_errors.mdoc
DEPENDS ${CMAKE_SOURCE_DIR}/lib/zip.h ${PROJECT_SOURCE_DIR}/man/zip_errors.mdoc
)
diff --git a/man/ZIP_SOURCE_GET_ARGS.html b/man/ZIP_SOURCE_GET_ARGS.html
index 0293872..0c73ac3 100644
--- a/man/ZIP_SOURCE_GET_ARGS.html
+++ b/man/ZIP_SOURCE_GET_ARGS.html
@@ -107,7 +107,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/libzip.html b/man/libzip.html
index 6d0a64f..3704fd6 100644
--- a/man/libzip.html
+++ b/man/libzip.html
@@ -245,7 +245,7 @@
<table class="foot">
<tr>
<td class="foot-date">April 17, 2020</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_add.html b/man/zip_add.html
index 376f543..c0ee6d9 100644
--- a/man/zip_add.html
+++ b/man/zip_add.html
@@ -114,7 +114,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_add_dir.html b/man/zip_add_dir.html
index be9fd78..e4b808a 100644
--- a/man/zip_add_dir.html
+++ b/man/zip_add_dir.html
@@ -95,7 +95,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_close.html b/man/zip_close.html
index 3b1f3e8..04665b5 100644
--- a/man/zip_close.html
+++ b/man/zip_close.html
@@ -138,7 +138,7 @@
<table class="foot">
<tr>
<td class="foot-date">September 17, 2019</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_compression_method_supported.html b/man/zip_compression_method_supported.html
index 1961432..f5b9941 100644
--- a/man/zip_compression_method_supported.html
+++ b/man/zip_compression_method_supported.html
@@ -98,7 +98,7 @@
<table class="foot">
<tr>
<td class="foot-date">April 2, 2020</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_delete.html b/man/zip_delete.html
index 7f2bad9..32ccbf3 100644
--- a/man/zip_delete.html
+++ b/man/zip_delete.html
@@ -107,7 +107,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_dir_add.html b/man/zip_dir_add.html
index a2b4ff6..ab0d42b 100644
--- a/man/zip_dir_add.html
+++ b/man/zip_dir_add.html
@@ -126,7 +126,7 @@
<table class="foot">
<tr>
<td class="foot-date">April 25, 2020</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_discard.html b/man/zip_discard.html
index dd375b8..ead6dfa 100644
--- a/man/zip_discard.html
+++ b/man/zip_discard.html
@@ -90,7 +90,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_encryption_method_supported.html b/man/zip_encryption_method_supported.html
index 282b6a6..3965cf4 100644
--- a/man/zip_encryption_method_supported.html
+++ b/man/zip_encryption_method_supported.html
@@ -98,7 +98,7 @@
<table class="foot">
<tr>
<td class="foot-date">April 2, 2020</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_error_clear.html b/man/zip_error_clear.html
index 9fb9ed1..7a873cb 100644
--- a/man/zip_error_clear.html
+++ b/man/zip_error_clear.html
@@ -97,7 +97,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_error_code_system.html b/man/zip_error_code_system.html
index 8f92724..736af95 100644
--- a/man/zip_error_code_system.html
+++ b/man/zip_error_code_system.html
@@ -92,7 +92,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_error_code_zip.html b/man/zip_error_code_zip.html
index 2eba46d..25c58ab 100644
--- a/man/zip_error_code_zip.html
+++ b/man/zip_error_code_zip.html
@@ -89,7 +89,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_error_fini.html b/man/zip_error_fini.html
index fadc40b..2b56d42 100644
--- a/man/zip_error_fini.html
+++ b/man/zip_error_fini.html
@@ -90,7 +90,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_error_get.html b/man/zip_error_get.html
index 263cc51..3e43051 100644
--- a/man/zip_error_get.html
+++ b/man/zip_error_get.html
@@ -143,7 +143,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_error_get_sys_type.html b/man/zip_error_get_sys_type.html
index dbe549a..a0c34a3 100644
--- a/man/zip_error_get_sys_type.html
+++ b/man/zip_error_get_sys_type.html
@@ -109,7 +109,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_error_init.html b/man/zip_error_init.html
index 76402e1..72e9074 100644
--- a/man/zip_error_init.html
+++ b/man/zip_error_init.html
@@ -101,7 +101,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_error_set.html b/man/zip_error_set.html
index 103404c..5e56802 100644
--- a/man/zip_error_set.html
+++ b/man/zip_error_set.html
@@ -94,7 +94,7 @@
<table class="foot">
<tr>
<td class="foot-date">April 2, 2020</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_error_strerror.html b/man/zip_error_strerror.html
index 11fb8dd..a7fb403 100644
--- a/man/zip_error_strerror.html
+++ b/man/zip_error_strerror.html
@@ -94,7 +94,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_error_system_type.html b/man/zip_error_system_type.html
index d26b606..2553cad 100644
--- a/man/zip_error_system_type.html
+++ b/man/zip_error_system_type.html
@@ -100,7 +100,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_error_to_data.html b/man/zip_error_to_data.html
index 63a8d77..8cd34c9 100644
--- a/man/zip_error_to_data.html
+++ b/man/zip_error_to_data.html
@@ -101,7 +101,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_error_to_str.html b/man/zip_error_to_str.html
index 16534f8..bab4572 100644
--- a/man/zip_error_to_str.html
+++ b/man/zip_error_to_str.html
@@ -117,7 +117,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_errors.html b/man/zip_errors.html
index d89896a..12479be 100644
--- a/man/zip_errors.html
+++ b/man/zip_errors.html
@@ -143,7 +143,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_fclose.html b/man/zip_fclose.html
index 8223f5e..31e0ec8 100644
--- a/man/zip_fclose.html
+++ b/man/zip_fclose.html
@@ -96,7 +96,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_fdopen.html b/man/zip_fdopen.html
index 3b38bb5..7f0bab8 100644
--- a/man/zip_fdopen.html
+++ b/man/zip_fdopen.html
@@ -147,7 +147,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_file_add.html b/man/zip_file_add.html
index 34a2864..b22e2fa 100644
--- a/man/zip_file_add.html
+++ b/man/zip_file_add.html
@@ -170,7 +170,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_file_extra_field_delete.html b/man/zip_file_extra_field_delete.html
index e861bd1..5d20ae1 100644
--- a/man/zip_file_extra_field_delete.html
+++ b/man/zip_file_extra_field_delete.html
@@ -152,7 +152,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_file_extra_field_get.html b/man/zip_file_extra_field_get.html
index 7f25b60..0caa3f4 100644
--- a/man/zip_file_extra_field_get.html
+++ b/man/zip_file_extra_field_get.html
@@ -169,7 +169,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_file_extra_field_set.html b/man/zip_file_extra_field_set.html
index adfa7b4..3d25614 100644
--- a/man/zip_file_extra_field_set.html
+++ b/man/zip_file_extra_field_set.html
@@ -141,7 +141,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_file_extra_fields_count.html b/man/zip_file_extra_fields_count.html
index b38b358..a5bdeaa 100644
--- a/man/zip_file_extra_fields_count.html
+++ b/man/zip_file_extra_fields_count.html
@@ -142,7 +142,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_file_get_comment.html b/man/zip_file_get_comment.html
index 41d9f18..85d34c5 100644
--- a/man/zip_file_get_comment.html
+++ b/man/zip_file_get_comment.html
@@ -135,7 +135,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_file_get_error.html b/man/zip_file_get_error.html
index 81241f6..3690bf6 100644
--- a/man/zip_file_get_error.html
+++ b/man/zip_file_get_error.html
@@ -88,7 +88,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_file_get_external_attributes.html b/man/zip_file_get_external_attributes.html
index 55d6eda..b5e5892 100644
--- a/man/zip_file_get_external_attributes.html
+++ b/man/zip_file_get_external_attributes.html
@@ -169,7 +169,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_file_rename.html b/man/zip_file_rename.html
index 5cbb818..19373d7 100644
--- a/man/zip_file_rename.html
+++ b/man/zip_file_rename.html
@@ -124,7 +124,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_file_set_comment.html b/man/zip_file_set_comment.html
index f94c4a4..8f1c440 100644
--- a/man/zip_file_set_comment.html
+++ b/man/zip_file_set_comment.html
@@ -129,7 +129,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_file_set_encryption.html b/man/zip_file_set_encryption.html
index 2804549..5313e57 100644
--- a/man/zip_file_set_encryption.html
+++ b/man/zip_file_set_encryption.html
@@ -143,7 +143,7 @@
<table class="foot">
<tr>
<td class="foot-date">April 2, 2020</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_file_set_external_attributes.html b/man/zip_file_set_external_attributes.html
index 3b84477..2b1ff95 100644
--- a/man/zip_file_set_external_attributes.html
+++ b/man/zip_file_set_external_attributes.html
@@ -118,7 +118,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_file_set_mtime.html b/man/zip_file_set_mtime.html
index bc63570..51f4966 100644
--- a/man/zip_file_set_mtime.html
+++ b/man/zip_file_set_mtime.html
@@ -157,7 +157,7 @@
<table class="foot">
<tr>
<td class="foot-date">January 7, 2020</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_file_strerror.html b/man/zip_file_strerror.html
index bdfa44c..fe81f1c 100644
--- a/man/zip_file_strerror.html
+++ b/man/zip_file_strerror.html
@@ -108,7 +108,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_fopen.html b/man/zip_fopen.html
index c1634a4..41bbceb 100644
--- a/man/zip_fopen.html
+++ b/man/zip_fopen.html
@@ -164,7 +164,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_fopen_encrypted.html b/man/zip_fopen_encrypted.html
index a1b7886..d6c15d0 100644
--- a/man/zip_fopen_encrypted.html
+++ b/man/zip_fopen_encrypted.html
@@ -137,7 +137,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_fread.html b/man/zip_fread.html
index ad3ce41..9bc8ffe 100644
--- a/man/zip_fread.html
+++ b/man/zip_fread.html
@@ -103,7 +103,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_fseek.html b/man/zip_fseek.html
index 1f405c4..4c3851b 100644
--- a/man/zip_fseek.html
+++ b/man/zip_fseek.html
@@ -103,7 +103,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_ftell.html b/man/zip_ftell.html
index 2c96188..7202752 100644
--- a/man/zip_ftell.html
+++ b/man/zip_ftell.html
@@ -100,7 +100,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_get_archive_comment.html b/man/zip_get_archive_comment.html
index ef5ff42..fc845e2 100644
--- a/man/zip_get_archive_comment.html
+++ b/man/zip_get_archive_comment.html
@@ -123,7 +123,7 @@
<table class="foot">
<tr>
<td class="foot-date">July 22, 2018</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_get_archive_flag.html b/man/zip_get_archive_flag.html
index fbed0a9..53d3545 100644
--- a/man/zip_get_archive_flag.html
+++ b/man/zip_get_archive_flag.html
@@ -111,7 +111,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_get_error.html b/man/zip_get_error.html
index 8bd4c0d..7cc9460 100644
--- a/man/zip_get_error.html
+++ b/man/zip_get_error.html
@@ -90,7 +90,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_get_file_comment.html b/man/zip_get_file_comment.html
index 56ea8ae..ad7cfb9 100644
--- a/man/zip_get_file_comment.html
+++ b/man/zip_get_file_comment.html
@@ -98,7 +98,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_get_name.html b/man/zip_get_name.html
index 5e83a5f..1b796f4 100644
--- a/man/zip_get_name.html
+++ b/man/zip_get_name.html
@@ -139,7 +139,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_get_num_entries.html b/man/zip_get_num_entries.html
index e5e803d..4644b9c 100644
--- a/man/zip_get_num_entries.html
+++ b/man/zip_get_num_entries.html
@@ -104,7 +104,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_get_num_files.html b/man/zip_get_num_files.html
index 2ad41e8..a941d3d 100644
--- a/man/zip_get_num_files.html
+++ b/man/zip_get_num_files.html
@@ -103,7 +103,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_libzip_version.html b/man/zip_libzip_version.html
index 9b72213..440272b 100644
--- a/man/zip_libzip_version.html
+++ b/man/zip_libzip_version.html
@@ -91,7 +91,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_name_locate.html b/man/zip_name_locate.html
index fb77b03..45159b2 100644
--- a/man/zip_name_locate.html
+++ b/man/zip_name_locate.html
@@ -141,7 +141,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_open.html b/man/zip_open.html
index 6e63143..3c07458 100644
--- a/man/zip_open.html
+++ b/man/zip_open.html
@@ -169,7 +169,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_register_progress_callback.html b/man/zip_register_progress_callback.html
index 041aa12..da6294e 100644
--- a/man/zip_register_progress_callback.html
+++ b/man/zip_register_progress_callback.html
@@ -104,7 +104,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_register_progress_callback_with_state.html b/man/zip_register_progress_callback_with_state.html
index cea9980..84a1225 100644
--- a/man/zip_register_progress_callback_with_state.html
+++ b/man/zip_register_progress_callback_with_state.html
@@ -111,7 +111,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_rename.html b/man/zip_rename.html
index a39a378..57e3ed4 100644
--- a/man/zip_rename.html
+++ b/man/zip_rename.html
@@ -97,7 +97,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_set_archive_comment.html b/man/zip_set_archive_comment.html
index 2ebc1fc..01e1a8d 100644
--- a/man/zip_set_archive_comment.html
+++ b/man/zip_set_archive_comment.html
@@ -117,7 +117,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_set_archive_flag.html b/man/zip_set_archive_flag.html
index 431e271..73a50db 100644
--- a/man/zip_set_archive_flag.html
+++ b/man/zip_set_archive_flag.html
@@ -100,7 +100,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_set_default_password.html b/man/zip_set_default_password.html
index 3b1116c..e6e09b0 100644
--- a/man/zip_set_default_password.html
+++ b/man/zip_set_default_password.html
@@ -112,7 +112,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_set_file_comment.html b/man/zip_set_file_comment.html
index 67735cc..025e11d 100644
--- a/man/zip_set_file_comment.html
+++ b/man/zip_set_file_comment.html
@@ -102,7 +102,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_set_file_compression.html b/man/zip_set_file_compression.html
index ad71da8..872e0d3 100644
--- a/man/zip_set_file_compression.html
+++ b/man/zip_set_file_compression.html
@@ -142,7 +142,7 @@
<table class="foot">
<tr>
<td class="foot-date">April 2, 2020</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_source.html b/man/zip_source.html
index c978520..ef0f328 100644
--- a/man/zip_source.html
+++ b/man/zip_source.html
@@ -110,7 +110,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_source_begin_write.html b/man/zip_source_begin_write.html
index b6367f7..ac2b7af 100644
--- a/man/zip_source_begin_write.html
+++ b/man/zip_source_begin_write.html
@@ -116,7 +116,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_source_buffer.html b/man/zip_source_buffer.html
index d4c428e..6f75ab1 100644
--- a/man/zip_source_buffer.html
+++ b/man/zip_source_buffer.html
@@ -128,7 +128,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_source_buffer_fragment.html b/man/zip_source_buffer_fragment.html
index 3b4d736..cff8428 100644
--- a/man/zip_source_buffer_fragment.html
+++ b/man/zip_source_buffer_fragment.html
@@ -143,7 +143,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_source_close.html b/man/zip_source_close.html
index 5193bad..2e419f9 100644
--- a/man/zip_source_close.html
+++ b/man/zip_source_close.html
@@ -98,7 +98,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_source_commit_write.html b/man/zip_source_commit_write.html
index a5a6b2e..565dbe3 100644
--- a/man/zip_source_commit_write.html
+++ b/man/zip_source_commit_write.html
@@ -102,7 +102,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_source_error.html b/man/zip_source_error.html
index 8afe2c2..bee42f8 100644
--- a/man/zip_source_error.html
+++ b/man/zip_source_error.html
@@ -90,7 +90,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_source_file.html b/man/zip_source_file.html
index dccb60d..c81edb0 100644
--- a/man/zip_source_file.html
+++ b/man/zip_source_file.html
@@ -134,7 +134,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_source_filep.html b/man/zip_source_filep.html
index 1d1d12e..0f5bc6c 100644
--- a/man/zip_source_filep.html
+++ b/man/zip_source_filep.html
@@ -130,7 +130,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_source_free.html b/man/zip_source_free.html
index 85926db..3848c17 100644
--- a/man/zip_source_free.html
+++ b/man/zip_source_free.html
@@ -97,7 +97,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_source_function.html b/man/zip_source_function.html
index 69924f3..33df81c 100644
--- a/man/zip_source_function.html
+++ b/man/zip_source_function.html
@@ -373,7 +373,7 @@
<table class="foot">
<tr>
<td class="foot-date">April 17, 2020</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_source_is_deleted.html b/man/zip_source_is_deleted.html
index 881a3f8..2b19579 100644
--- a/man/zip_source_is_deleted.html
+++ b/man/zip_source_is_deleted.html
@@ -96,7 +96,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_source_keep.html b/man/zip_source_keep.html
index 29e5698..47e3104 100644
--- a/man/zip_source_keep.html
+++ b/man/zip_source_keep.html
@@ -90,7 +90,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_source_make_command_bitmap.html b/man/zip_source_make_command_bitmap.html
index fbba270..8cd3d42 100644
--- a/man/zip_source_make_command_bitmap.html
+++ b/man/zip_source_make_command_bitmap.html
@@ -92,7 +92,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_source_open.html b/man/zip_source_open.html
index d3ea3fc..46b693f 100644
--- a/man/zip_source_open.html
+++ b/man/zip_source_open.html
@@ -101,7 +101,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_source_read.html b/man/zip_source_read.html
index 38b3f18..febeeaf 100644
--- a/man/zip_source_read.html
+++ b/man/zip_source_read.html
@@ -105,7 +105,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_source_rollback_write.html b/man/zip_source_rollback_write.html
index 7134059..5859274 100644
--- a/man/zip_source_rollback_write.html
+++ b/man/zip_source_rollback_write.html
@@ -103,7 +103,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_source_seek.html b/man/zip_source_seek.html
index d1e57ee..c36f93b 100644
--- a/man/zip_source_seek.html
+++ b/man/zip_source_seek.html
@@ -113,7 +113,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_source_seek_compute_offset.html b/man/zip_source_seek_compute_offset.html
index 1891f34..ad5947c 100644
--- a/man/zip_source_seek_compute_offset.html
+++ b/man/zip_source_seek_compute_offset.html
@@ -112,7 +112,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_source_seek_write.html b/man/zip_source_seek_write.html
index 6b8c265..a1eb4fa 100644
--- a/man/zip_source_seek_write.html
+++ b/man/zip_source_seek_write.html
@@ -116,7 +116,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_source_stat.html b/man/zip_source_stat.html
index 236b9a5..6da1220 100644
--- a/man/zip_source_stat.html
+++ b/man/zip_source_stat.html
@@ -147,7 +147,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_source_tell.html b/man/zip_source_tell.html
index 7c7c830..039266e 100644
--- a/man/zip_source_tell.html
+++ b/man/zip_source_tell.html
@@ -101,7 +101,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_source_tell_write.html b/man/zip_source_tell_write.html
index 1c166f7..664e1fd 100644
--- a/man/zip_source_tell_write.html
+++ b/man/zip_source_tell_write.html
@@ -105,7 +105,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_source_win32a.html b/man/zip_source_win32a.html
index 7ae9c49..ee962e0 100644
--- a/man/zip_source_win32a.html
+++ b/man/zip_source_win32a.html
@@ -136,7 +136,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_source_win32handle.html b/man/zip_source_win32handle.html
index 20bb7ea..19b16d1 100644
--- a/man/zip_source_win32handle.html
+++ b/man/zip_source_win32handle.html
@@ -136,7 +136,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_source_win32w.html b/man/zip_source_win32w.html
index 2aa5658..e6dc629 100644
--- a/man/zip_source_win32w.html
+++ b/man/zip_source_win32w.html
@@ -135,7 +135,7 @@
<table class="foot">
<tr>
<td class="foot-date">June 22, 2018</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_source_write.html b/man/zip_source_write.html
index 942e880..bb6549c 100644
--- a/man/zip_source_write.html
+++ b/man/zip_source_write.html
@@ -108,7 +108,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_source_zip.html b/man/zip_source_zip.html
index 9061f13..f5b07c4 100644
--- a/man/zip_source_zip.html
+++ b/man/zip_source_zip.html
@@ -136,7 +136,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_stat.html b/man/zip_stat.html
index dab3dfc..448c640 100644
--- a/man/zip_stat.html
+++ b/man/zip_stat.html
@@ -183,7 +183,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_stat_init.html b/man/zip_stat_init.html
index e1587f6..04fc192 100644
--- a/man/zip_stat_init.html
+++ b/man/zip_stat_init.html
@@ -102,7 +102,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_unchange.html b/man/zip_unchange.html
index 48aaa46..24bf898 100644
--- a/man/zip_unchange.html
+++ b/man/zip_unchange.html
@@ -109,7 +109,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_unchange_all.html b/man/zip_unchange_all.html
index fab1290..04da2d0 100644
--- a/man/zip_unchange_all.html
+++ b/man/zip_unchange_all.html
@@ -96,7 +96,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zip_unchange_archive.html b/man/zip_unchange_archive.html
index effeed1..0efd0bc 100644
--- a/man/zip_unchange_archive.html
+++ b/man/zip_unchange_archive.html
@@ -96,7 +96,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zipcmp.html b/man/zipcmp.html
index 81dc79b..a174124 100644
--- a/man/zipcmp.html
+++ b/man/zipcmp.html
@@ -115,7 +115,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/zipmerge.html b/man/zipmerge.html
index f6c3f10..a3b83de 100644
--- a/man/zipmerge.html
+++ b/man/zipmerge.html
@@ -118,7 +118,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/man/ziptool.html b/man/ziptool.html
index 650bab8..4fef345 100644
--- a/man/ziptool.html
+++ b/man/ziptool.html
@@ -308,7 +308,7 @@
<table class="foot">
<tr>
<td class="foot-date">December 18, 2017</td>
- <td class="foot-os">NetBSD 9.99.63</td>
+ <td class="foot-os">NetBSD 9.99.67</td>
</tr>
</table>
</body>
diff --git a/regress/CMakeLists.txt b/regress/CMakeLists.txt
index b895ab6..0c31117 100644
--- a/regress/CMakeLists.txt
+++ b/regress/CMakeLists.txt
@@ -1,52 +1,52 @@
-CHECK_FUNCTION_EXISTS(getopt HAVE_GETOPT)
-IF(NOT HAVE_GETOPT)
- SET(SRC_EXTRA_FILES ../src/getopt.c)
-ENDIF()
+check_function_exists(getopt HAVE_GETOPT)
+if(NOT HAVE_GETOPT)
+ set(SRC_EXTRA_FILES ../src/getopt.c)
+endif()
-SET(TEST_PROGRAMS
+set(TEST_PROGRAMS
add_from_filep
fopen_unchanged
fseek
nonrandomopentest
)
-SET(GETOPT_USERS
+set(GETOPT_USERS
fread
tryopen
)
-ADD_EXECUTABLE(can_clone_file can_clone_file.c)
+add_executable(can_clone_file can_clone_file.c)
-SET(ENV{srcdir} ${PROJECT_SOURCE_DIR}/regress)
-FOREACH(PROGRAM ${TEST_PROGRAMS})
- ADD_EXECUTABLE(${PROGRAM} ${PROGRAM}.c)
- TARGET_LINK_LIBRARIES(${PROGRAM} zip)
-ENDFOREACH()
+set(ENV{srcdir} ${PROJECT_SOURCE_DIR}/regress)
+foreach(PROGRAM ${TEST_PROGRAMS})
+ add_executable(${PROGRAM} ${PROGRAM}.c)
+ target_link_libraries(${PROGRAM} zip)
+endforeach()
-ADD_EXECUTABLE(hole hole.c ${SRC_EXTRA_FILES} source_hole.c)
-TARGET_LINK_LIBRARIES(hole zip)
+add_executable(hole hole.c ${SRC_EXTRA_FILES} source_hole.c)
+target_link_libraries(hole zip)
-ADD_EXECUTABLE(ziptool_regress ziptool_regress.c ${SRC_EXTRA_FILES} source_hole.c)
-TARGET_LINK_LIBRARIES(ziptool_regress zip)
+add_executable(ziptool_regress ziptool_regress.c ${SRC_EXTRA_FILES} source_hole.c)
+target_link_libraries(ziptool_regress zip)
-#ADD_LIBRARY(malloc MODULE malloc.c)
-#TARGET_LINK_LIBRARIES(malloc ${CMAKE_DL_LIBS})
-ADD_LIBRARY(nonrandomopen MODULE nonrandomopen.c)
-TARGET_LINK_LIBRARIES(nonrandomopen ${CMAKE_DL_LIBS})
+#add_library(malloc MODULE malloc.c)
+#target_link_LIBRARIES(malloc ${CMAKE_DL_LIBS})
+add_library(nonrandomopen MODULE nonrandomopen.c)
+target_link_libraries(nonrandomopen ${CMAKE_DL_LIBS})
-FOREACH(PROGRAM ${GETOPT_USERS})
- ADD_EXECUTABLE(${PROGRAM} ${PROGRAM}.c ${SRC_EXTRA_FILES})
- TARGET_LINK_LIBRARIES(${PROGRAM} zip)
-ENDFOREACH()
+foreach(PROGRAM ${GETOPT_USERS})
+ add_executable(${PROGRAM} ${PROGRAM}.c ${SRC_EXTRA_FILES})
+ target_link_libraries(${PROGRAM} zip)
+endforeach()
# for appveyor builds
-#SET(CMAKE_MSVCIDE_RUN_PATH C:/projects/libzip/vstudio/zlib/installed/bin;C:/projects/libzip/vstudio/zlib/installed/lib;C:/projects/libzip/build/lib/Release)
+#set(CMAKE_MSVCIDE_RUN_PATH C:/projects/libzip/vstudio/zlib/installed/bin;C:/projects/libzip/vstudio/zlib/installed/lib;C:/projects/libzip/build/lib/Release)
-ADD_CUSTOM_TARGET(cleanup
+add_custom_target(cleanup
COMMAND ${CMAKE_COMMAND} -DDIR=${PROJECT_BINARY_DIR}/regress -P ${PROJECT_SOURCE_DIR}/regress/cleanup.cmake
)
-ADD_CUSTOM_TARGET(testinput
+add_custom_target(testinput
ALL
VERBATIM
COMMAND ${CMAKE_COMMAND} -E tar x ${PROJECT_SOURCE_DIR}/regress/manyfiles-zip.zip
@@ -54,7 +54,7 @@
DEPENDS ${PROJECT_SOURCE_DIR}/regress/manyfiles-zip.zip ${PROJECT_SOURCE_DIR}/regress/bigzero-zip.zip
)
-SET_PROPERTY(DIRECTORY PROPERTY ADDITIONAL_MAKE_CLEAN_FILES
+set_property(DIRECTORY PROPERTY ADDITIONAL_MAKE_CLEAN_FILES
bigzero.zip
manyfiles-133000.zip
manyfiles-65536.zip
@@ -65,7 +65,7 @@
manyfiles.zip
)
-SET(EXTRA_TESTS
+set(EXTRA_TESTS
add_dir.test
add_from_buffer.test
add_from_file.test
@@ -209,15 +209,15 @@
endif()
string(REPLACE ";" "\\;" path "${path}")
-FOREACH(CASE ${EXTRA_TESTS})
- ADD_TEST(NAME ${CASE} COMMAND ${PERL_EXECUTABLE} ${PROJECT_BINARY_DIR}/regress/runtest --bin-sub-directory $<CONFIG> ${PROJECT_SOURCE_DIR}/regress/${CASE})
- SET_TESTS_PROPERTIES(${CASE} PROPERTIES SKIP_RETURN_CODE 77)
- SET_TESTS_PROPERTIES(${CASE} PROPERTIES ENVIRONMENT "PATH=${path}")
-ENDFOREACH()
+foreach(CASE ${EXTRA_TESTS})
+ add_test(NAME ${CASE} COMMAND ${PERL_EXECUTABLE} ${PROJECT_BINARY_DIR}/regress/runtest --bin-sub-directory $<CONFIG> ${PROJECT_SOURCE_DIR}/regress/${CASE})
+ set_tests_properties(${CASE} PROPERTIES SKIP_RETURN_CODE 77)
+ set_tests_properties(${CASE} PROPERTIES ENVIRONMENT "PATH=${path}")
+endforeach()
-INCLUDE_DIRECTORIES(BEFORE ${PROJECT_SOURCE_DIR}/lib ${PROJECT_SOURCE_DIR}/src ${PROJECT_BINARY_DIR})
+include_directories(BEFORE ${PROJECT_SOURCE_DIR}/lib ${PROJECT_SOURCE_DIR}/src ${PROJECT_BINARY_DIR})
-ADD_CUSTOM_TARGET(check COMMAND ${CMAKE_CTEST_COMMAND})
+add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND})
-ADD_EXECUTABLE(fuzz_main fuzz_main.c)
-TARGET_LINK_LIBRARIES(fuzz_main zip)
+add_executable(fuzz_main fuzz_main.c)
+target_link_libraries(fuzz_main zip)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 78135d9..0129de2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,24 +1,24 @@
-INCLUDE_DIRECTORIES(BEFORE ${PROJECT_SOURCE_DIR}/lib ${PROJECT_BINARY_DIR})
+include_directories(BEFORE ${PROJECT_SOURCE_DIR}/lib ${PROJECT_BINARY_DIR})
-CHECK_FUNCTION_EXISTS(getopt HAVE_GETOPT)
-IF(NOT HAVE_GETOPT)
- SET(SRC_EXTRA_FILES getopt.c)
-ENDIF(NOT HAVE_GETOPT)
+check_function_exists(getopt HAVE_GETOPT)
+if(NOT HAVE_GETOPT)
+ set(SRC_EXTRA_FILES getopt.c)
+endif(NOT HAVE_GETOPT)
-ADD_EXECUTABLE(zipcmp zipcmp.c ${SRC_EXTRA_FILES})
-TARGET_LINK_LIBRARIES(zipcmp zip ${FTS_LIB} ${ZLIB_LIBRARIES})
-IF(LIBZIP_DO_INSTALL)
- INSTALL(TARGETS zipcmp EXPORT ${PROJECT_NAME}-targets RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-ENDIF()
+add_executable(zipcmp zipcmp.c ${SRC_EXTRA_FILES})
+target_link_libraries(zipcmp zip ${FTS_LIB} ${ZLIB_LIBRARIES})
+if(LIBZIP_DO_INSTALL)
+ install(TARGETS zipcmp EXPORT ${PROJECT_NAME}-targets RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+endif()
-ADD_EXECUTABLE(zipmerge zipmerge.c ${SRC_EXTRA_FILES})
-TARGET_LINK_LIBRARIES(zipmerge zip)
-IF(LIBZIP_DO_INSTALL)
- INSTALL(TARGETS zipmerge EXPORT ${PROJECT_NAME}-targets RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-ENDIF()
+add_executable(zipmerge zipmerge.c ${SRC_EXTRA_FILES})
+target_link_libraries(zipmerge zip)
+if(LIBZIP_DO_INSTALL)
+ install(TARGETS zipmerge EXPORT ${PROJECT_NAME}-targets RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+endif()
-ADD_EXECUTABLE(ziptool ziptool.c ${SRC_EXTRA_FILES})
-TARGET_LINK_LIBRARIES(ziptool zip)
-IF(LIBZIP_DO_INSTALL)
- INSTALL(TARGETS ziptool EXPORT ${PROJECT_NAME}-targets RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-ENDIF()
+add_executable(ziptool ziptool.c ${SRC_EXTRA_FILES})
+target_link_libraries(ziptool zip)
+if(LIBZIP_DO_INSTALL)
+ install(TARGETS ziptool EXPORT ${PROJECT_NAME}-targets RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+endif()