From: Guido Draheim <guidod@gmx.de>
Date: Sat, 15 Sep 2018 11:39:54 +0000 (+0200)
Subject: move build of libzzip from topdir into zzip/
X-Git-Tag: v0.13.72~101
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e692106d8c0ac1ffe88066c0caa3427b791cb2de;p=zziplib

move build of libzzip from topdir into zzip/
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4f06474..c9287ef 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,136 +10,9 @@ MESSAGE(STATUS "VERSION ${VERSION} -> VERNUM ${VERNUM}")
 MESSAGE(STATUS "VERSION ${VERSION} -> FIXNUM ${FIXNUM}")
 # the "0." on FIXNUM is just for compatibility with automake's libtool.
 
-# generate _config.h
-include ( CheckIncludeFiles )
-include ( CheckFunctionExists )
-include ( CheckSymbolExists )
-include ( CheckTypeSize )
-include ( TestBigEndian )
 include ( GNUInstallDirs )
 
-# options ###########################################################
-option(BUILD_SHARED_LIBS "Build a shared library" ON)
-option(BUILD_STATIC_LIBS "Build the static library" OFF)
-option(BUILD_TESTS "Build test programs" OFF)
-option(MSVC_STATIC_RUNTIME "Build with static runtime libs (/MT)" ON)
-option(ZZIPMMAPPED "Build libzzipmmapped (not fully portable)" ON)
-option(ZZIPFSEEKO "Build libzzipfseeko (based on posix.1 api)" ON)
-option(ZZIPWRAP "Build libzzipwrap (non-installed example)" ON)
-option(ZZIPSDL "Build zzcatsdl (includable example code)" ON)
-option(ZZIPBINS "Build bins/unzzip (unzip-like executables)" ON)
-option(ZZIPTEST "Build test/zzipself (self-extract example)" ON)
-option(ZZIPDOCS "Build docs/manpages (and website content)" ON)
-
-check_include_files ( byteswap.h ZZIP_HAVE_BYTESWAP_H )
-check_include_files ( direct.h ZZIP_HAVE_DIRECT_H )
-
-if(NOT ANDROID)
-    check_include_files ( dirent.h ZZIP_HAVE_DIRENT_H )
-endif()
-
-check_include_files ( dlfcn.h ZZIP_HAVE_DLFCN_H )
-check_include_files ( fnmatch.h ZZIP_HAVE_FNMATCH_H )
-check_include_files ( inttypes.h ZZIP_HAVE_INTTYPES_H )
-check_include_files ( io.h ZZIP_HAVE_IO_H )
-check_include_files ( memory.h ZZIP_HAVE_MEMORY_H )
-check_include_files ( ndir.h ZZIP_HAVE_NDIR_H )
-check_include_files ( stdint.h ZZIP_HAVE_STDINT_H )
-check_include_files ( stdlib.h ZZIP_HAVE_STDLIB_H )
-check_function_exists ( strcasecmp ZZIP_HAVE_STRCASECMP )
-check_include_files ( strings.h ZZIP_HAVE_STRINGS_H )
-check_include_files ( string.h ZZIP_HAVE_STRING_H )
-check_function_exists ( strndup ZZIP_HAVE_STRNDUP )
-check_include_files ( "sys/dir.h" ZZIP_HAVE_SYS_DIR_H )
-check_include_files ( "sys/int_types.h" ZZIP_HAVE_SYS_INT_TYPES_H )
-check_include_files ( "sys/mman.h" ZZIP_HAVE_SYS_MMAN_H )
-check_include_files ( "sys/ndir.h" ZZIP_HAVE_SYS_NDIR_H )
-check_include_files ( "sys/param.h" ZZIP_HAVE_SYS_PARAM_H )
-check_include_files ( "sys/stat.h" ZZIP_HAVE_SYS_STAT_H )
-check_include_files ( "sys/types.h" ZZIP_HAVE_SYS_TYPES_H )
-check_include_files ( unistd.h ZZIP_HAVE_UNISTD_H )
-check_include_files ( winbase.h ZZIP_HAVE_WINBASE_H )
-check_include_files ( windows.h ZZIP_HAVE_WINDOWS_H )
-check_include_files ( winnt.h ZZIP_HAVE_WINNT_H )
-set ( ZZIP_HAVE_ZLIB_H 1 )
-
-check_type_size ( int ZZIP_SIZEOF_INT )
-check_type_size ( long ZZIP_SIZEOF_LONG )
-check_type_size ( short ZZIP_SIZEOF_SHORT )
-check_include_files ( "stdlib.h;stdarg.h;string.h;float.h" ZZIP_STDC_HEADERS )
-test_big_endian ( ZZIP_WORDS_BIGENDIAN )
-
-configure_file ( ${CMAKE_CURRENT_SOURCE_DIR}/_config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/zzip/_config.h )
-
-# Zlib library needed
-find_package ( ZLIB REQUIRED )
-
-if(UNIX)
-    add_definitions(
-        -Wpointer-arith
-        -Wsign-compare
-        -Wmissing-declarations
-        # -Wdeclaration-after-statement
-        -Werror-implicit-function-declaration
-        -Wstrict-aliasing
-        -Warray-bounds
-    )
-endif()
-
-set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-add_definitions ( -DHAVE_CONFIG_H )
-
-# targets ############################################################
-
-# libzlib library
-set(ZZIPLIB_SRCS 
-    zzip/dir.c
-    zzip/err.c 
-    zzip/file.c 
-    zzip/info.c 
-    zzip/plugin.c 
-    zzip/stat.c
-    zzip/write.c 
-    zzip/zip.c 
-    zzip/fetch.c)
-
-set(ZZIPLIB_HDRS
-    zzip/zzip.h
-    zzip/types.h
-    zzip/conf.h 
-    zzip/_msvc.h 
-    zzip/plugin.h 
-    zzip/fetch.h
-    ${CMAKE_CURRENT_BINARY_DIR}/zzip/_config.h)
-
-add_library(libzzip ${ZZIPLIB_SRCS} )
-target_link_libraries(libzzip ZLIB::ZLIB )
-target_include_directories (libzzip PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
-
-if(ZZIPFSEEKO)
-add_library(libzzipfseeko zzip/fseeko.c zzip/fetch.c )
-target_link_libraries(libzzipfseeko ZLIB::ZLIB )
-target_include_directories (libzzipfseeko PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
-endif()
-
-if(ZZIPMMAPPED)
-add_library(libzzipmmapped zzip/mmapped.c zzip/memdisk.c zzip/fetch.c )
-target_link_libraries(libzzipmmapped ZLIB::ZLIB )
-target_include_directories (libzzipmmapped PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
-endif()
-
-set_target_properties(libzzip PROPERTIES OUTPUT_NAME "zzip-${RELNUM}")
-SET_TARGET_PROPERTIES(libzzip PROPERTIES VERSION ${VERNUM}.${FIXNUM} SOVERSION ${VERNUM})
-
-if(ZZIPFSEEKO)
-set_target_properties(libzzipfseeko PROPERTIES OUTPUT_NAME "zzipfseeko-${RELNUM}")
-SET_TARGET_PROPERTIES(libzzipfseeko PROPERTIES VERSION ${VERNUM}.${FIXNUM} SOVERSION ${VERNUM})
-endif()
-
-if(ZZIPMMAPPED)
-set_target_properties(libzzipmmapped PROPERTIES OUTPUT_NAME "zzipmmapped-${RELNUM}")
-SET_TARGET_PROPERTIES(libzzipmmapped PROPERTIES VERSION ${VERNUM}.${FIXNUM} SOVERSION ${VERNUM})
-endif()
+add_subdirectory(zzip)
 
 if(ZZIPWRAP)
 add_subdirectory(zzipwrap)
@@ -160,39 +33,3 @@ endif()
 if(ZZIPDOCS)
 add_subdirectory(docs)
 endif()
-
-# install ########################################################
-install(FILES ${ZZIPLIB_HDRS} DESTINATION include/zzip )
-install(TARGETS libzzip 
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-if(ZZIPFSEEKO)
-install(TARGETS libzzipfseeko 
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-endif()
-if(ZZIPMMAPPED)
-install(TARGETS libzzipmmapped
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-endif()
-
-if(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG)
-  get_target_property(libname libzzip OUTPUT_NAME)
-  get_target_property(libversion libzzip VERSION)
-  set(lib ${CMAKE_SHARED_LIBRARY_PREFIX})
-  set(dll ${CMAKE_SHARED_LIBRARY_SUFFIX})
-  set(libdir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
-  if(${libversion} MATCHES "^[0-9].*")
-    install(CODE "execute_process(COMMAND bash -c \"set -e
-      cd $DESTDIR/${libdir}
-      [ -f ${lib}${libname}${dll}.${libversion} ] || exit 0
-      echo -n .. Installing: `pwd`
-      ln -sv ${lib}${libname}${dll}.${libversion} ${lib}${libname}${dll}.10
-      echo -n .. Installing: `pwd`
-      ln -sv ${lib}${libname}${dll}.${libversion} ${lib}${libname}${dll}.11
-      echo -n .. Installing: `pwd`
-      ln -sv ${lib}${libname}${dll}.${libversion} ${lib}${libname}${dll}.12
-      \")")
-  endif()
-endif()
diff --git a/zzip/CMakeLists.txt b/zzip/CMakeLists.txt
new file mode 100644
index 0000000..6db6ecc
--- /dev/null
+++ b/zzip/CMakeLists.txt
@@ -0,0 +1,180 @@
+cmake_minimum_required (VERSION 3.1)
+project(zziplib C)
+set(VERSION "0.13.69")
+
+if(NOT RELNUM)
+string(REGEX REPLACE "([^.]+)[.]([^.]+)[.]([^.]+)" "\\1" RELNUM ${VERSION})
+string(REGEX REPLACE "([^.]+)[.]([^.]+)[.]([^.]+)" "\\2" VERNUM ${VERSION})
+string(REGEX REPLACE "([^.]+)[.]([^.]+)[.]([^.]+)" "0.\\3" FIXNUM ${VERSION})
+MESSAGE(STATUS "VERSION ${VERSION} -> RELNUM ${RELNUM}")
+MESSAGE(STATUS "VERSION ${VERSION} -> VERNUM ${VERNUM}")
+MESSAGE(STATUS "VERSION ${VERSION} -> FIXNUM ${FIXNUM}")
+# the "0." on FIXNUM is just for compatibility with automake's libtool.
+endif()
+
+# generate _config.h
+include ( CheckIncludeFiles )
+include ( CheckFunctionExists )
+include ( CheckSymbolExists )
+include ( CheckTypeSize )
+include ( TestBigEndian )
+include ( GNUInstallDirs )
+
+# options ###########################################################
+option(BUILD_SHARED_LIBS "Build a shared library" ON)
+option(BUILD_STATIC_LIBS "Build the static library" OFF)
+option(BUILD_TESTS "Build test programs" OFF)
+option(MSVC_STATIC_RUNTIME "Build with static runtime libs (/MT)" ON)
+option(ZZIPMMAPPED "Build libzzipmmapped (not fully portable)" ON)
+option(ZZIPFSEEKO "Build libzzipfseeko (based on posix.1 api)" ON)
+option(ZZIPWRAP "Build libzzipwrap (non-installed example)" ON)
+option(ZZIPSDL "Build zzcatsdl (includable example code)" ON)
+option(ZZIPBINS "Build bins/unzzip (unzip-like executables)" ON)
+option(ZZIPTEST "Build test/zzipself (self-extract example)" ON)
+option(ZZIPDOCS "Build docs/manpages (and website content)" ON)
+
+check_include_files ( byteswap.h ZZIP_HAVE_BYTESWAP_H )
+check_include_files ( direct.h ZZIP_HAVE_DIRECT_H )
+
+if(NOT ANDROID)
+    check_include_files ( dirent.h ZZIP_HAVE_DIRENT_H )
+endif()
+
+check_include_files ( dlfcn.h ZZIP_HAVE_DLFCN_H )
+check_include_files ( fnmatch.h ZZIP_HAVE_FNMATCH_H )
+check_include_files ( inttypes.h ZZIP_HAVE_INTTYPES_H )
+check_include_files ( io.h ZZIP_HAVE_IO_H )
+check_include_files ( memory.h ZZIP_HAVE_MEMORY_H )
+check_include_files ( ndir.h ZZIP_HAVE_NDIR_H )
+check_include_files ( stdint.h ZZIP_HAVE_STDINT_H )
+check_include_files ( stdlib.h ZZIP_HAVE_STDLIB_H )
+check_function_exists ( strcasecmp ZZIP_HAVE_STRCASECMP )
+check_include_files ( strings.h ZZIP_HAVE_STRINGS_H )
+check_include_files ( string.h ZZIP_HAVE_STRING_H )
+check_function_exists ( strndup ZZIP_HAVE_STRNDUP )
+check_include_files ( "sys/dir.h" ZZIP_HAVE_SYS_DIR_H )
+check_include_files ( "sys/int_types.h" ZZIP_HAVE_SYS_INT_TYPES_H )
+check_include_files ( "sys/mman.h" ZZIP_HAVE_SYS_MMAN_H )
+check_include_files ( "sys/ndir.h" ZZIP_HAVE_SYS_NDIR_H )
+check_include_files ( "sys/param.h" ZZIP_HAVE_SYS_PARAM_H )
+check_include_files ( "sys/stat.h" ZZIP_HAVE_SYS_STAT_H )
+check_include_files ( "sys/types.h" ZZIP_HAVE_SYS_TYPES_H )
+check_include_files ( unistd.h ZZIP_HAVE_UNISTD_H )
+check_include_files ( winbase.h ZZIP_HAVE_WINBASE_H )
+check_include_files ( windows.h ZZIP_HAVE_WINDOWS_H )
+check_include_files ( winnt.h ZZIP_HAVE_WINNT_H )
+set ( ZZIP_HAVE_ZLIB_H 1 )
+
+check_type_size ( int ZZIP_SIZEOF_INT )
+check_type_size ( long ZZIP_SIZEOF_LONG )
+check_type_size ( short ZZIP_SIZEOF_SHORT )
+check_include_files ( "stdlib.h;stdarg.h;string.h;float.h" ZZIP_STDC_HEADERS )
+test_big_endian ( ZZIP_WORDS_BIGENDIAN )
+
+configure_file ( ${CMAKE_CURRENT_SOURCE_DIR}/_config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/_config.h )
+
+# Zlib library needed
+find_package ( ZLIB REQUIRED )
+
+if(UNIX)
+    add_definitions(
+        -Wpointer-arith
+        -Wsign-compare
+        -Wmissing-declarations
+        # -Wdeclaration-after-statement
+        -Werror-implicit-function-declaration
+        -Wstrict-aliasing
+        -Warray-bounds
+    )
+endif()
+
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+add_definitions ( -DHAVE_CONFIG_H )
+
+# targets ############################################################
+
+# libzlib library
+set(ZZIPLIB_SRCS 
+    dir.c
+    err.c 
+    file.c 
+    info.c 
+    plugin.c 
+    stat.c
+    write.c 
+    zip.c 
+    fetch.c)
+
+set(ZZIPLIB_HDRS
+    zzip.h
+    types.h
+    conf.h 
+    _msvc.h 
+    plugin.h 
+    fetch.h
+    ${CMAKE_CURRENT_BINARY_DIR}/_config.h)
+
+add_library(libzzip ${ZZIPLIB_SRCS} )
+target_link_libraries(libzzip ZLIB::ZLIB )
+target_include_directories (libzzip PRIVATE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
+
+if(ZZIPFSEEKO)
+add_library(libzzipfseeko fseeko.c fetch.c )
+target_link_libraries(libzzipfseeko ZLIB::ZLIB )
+target_include_directories (libzzipfseeko PRIVATE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
+endif()
+
+if(ZZIPMMAPPED)
+add_library(libzzipmmapped mmapped.c memdisk.c fetch.c )
+target_link_libraries(libzzipmmapped ZLIB::ZLIB )
+target_include_directories (libzzipmmapped PRIVATE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
+endif()
+
+set_target_properties(libzzip PROPERTIES OUTPUT_NAME "zzip-${RELNUM}")
+SET_TARGET_PROPERTIES(libzzip PROPERTIES VERSION ${VERNUM}.${FIXNUM} SOVERSION ${VERNUM})
+
+if(ZZIPFSEEKO)
+set_target_properties(libzzipfseeko PROPERTIES OUTPUT_NAME "zzipfseeko-${RELNUM}")
+SET_TARGET_PROPERTIES(libzzipfseeko PROPERTIES VERSION ${VERNUM}.${FIXNUM} SOVERSION ${VERNUM})
+endif()
+
+if(ZZIPMMAPPED)
+set_target_properties(libzzipmmapped PROPERTIES OUTPUT_NAME "zzipmmapped-${RELNUM}")
+SET_TARGET_PROPERTIES(libzzipmmapped PROPERTIES VERSION ${VERNUM}.${FIXNUM} SOVERSION ${VERNUM})
+endif()
+
+# install ########################################################
+install(FILES ${ZZIPLIB_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDE_DIR}/zzip )
+install(TARGETS libzzip 
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+if(ZZIPFSEEKO)
+install(TARGETS libzzipfseeko 
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+endif()
+if(ZZIPMMAPPED)
+install(TARGETS libzzipmmapped
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+endif()
+
+if(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG)
+  get_target_property(libname libzzip OUTPUT_NAME)
+  get_target_property(libversion libzzip VERSION)
+  set(lib ${CMAKE_SHARED_LIBRARY_PREFIX})
+  set(dll ${CMAKE_SHARED_LIBRARY_SUFFIX})
+  set(libdir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
+  if(${libversion} MATCHES "^[0-9].*")
+    install(CODE "execute_process(COMMAND bash -c \"set -e
+      cd $DESTDIR/${libdir}
+      [ -f ${lib}${libname}${dll}.${libversion} ] || exit 0
+      echo -n .. Installing: `pwd`
+      ln -sv ${lib}${libname}${dll}.${libversion} ${lib}${libname}${dll}.10
+      echo -n .. Installing: `pwd`
+      ln -sv ${lib}${libname}${dll}.${libversion} ${lib}${libname}${dll}.11
+      echo -n .. Installing: `pwd`
+      ln -sv ${lib}${libname}${dll}.${libversion} ${lib}${libname}${dll}.12
+      \")")
+  endif()
+endif()
diff --git a/_config.h.cmake b/zzip/_config.h.cmake
similarity index 100%
rename from _config.h.cmake
rename to zzip/_config.h.cmake