Fix -Werror=warning error and wrap some INSTALL directives with an ENABLE_INSTALL...

1. Fixes build when compiling without ZLIB/BZIP/LZMA `char finishing`
2. All INSTALL directives are now guarded by ENABLE_INSTALL

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9fd47412fb09905fe9af7f1720ac8a3c45298ed4..036aab30c22902420539383bfffbb4ce74b4b4d8 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -378,10 +378,12 @@ ENDMACRO (GENERATE_LIST_H)
 # Generate installation rules for man pages.
 #
 MACRO (INSTALL_MAN __mans)
-  FOREACH (_man ${ARGV})
-    STRING(REGEX REPLACE "^.+[.]([1-9])" "\\1" _mansect ${_man})
-    INSTALL(FILES ${_man} DESTINATION "share/man/man${_mansect}")
-  ENDFOREACH (_man)
+  IF(ENABLE_INSTALL)
+    FOREACH (_man ${ARGV})
+      STRING(REGEX REPLACE "^.+[.]([1-9])" "\\1" _mansect ${_man})
+      INSTALL(FILES ${_man} DESTINATION "share/man/man${_mansect}")
+    ENDFOREACH (_man)
+  ENDIF(ENABLE_INSTALL)
 ENDMACRO (INSTALL_MAN __mans)
 #
 # Find out what macro is needed to use libraries on Windows.
@@ -2176,7 +2178,7 @@ INCLUDE(CreatePkgConfigFile)
 #
 # Register installation of PDF documents.
 #
-IF(WIN32 AND NOT CYGWIN)
+IF(WIN32 AND NOT CYGWIN AND ENABLE_INSTALL)
   #
   # On Windows platform, It's better that we install PDF documents
   # on one's computer.
@@ -2188,7 +2190,7 @@ IF(WIN32 AND NOT CYGWIN)
             FILES_MATCHING PATTERN "*.pdf"
     )
   ENDIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/doc/pdf)
-ENDIF(WIN32 AND NOT CYGWIN)
+ENDIF(WIN32 AND NOT CYGWIN AND ENABLE_INSTALL)
 #
 #
 #

diff --git a/cat/CMakeLists.txt b/cat/CMakeLists.txt
index 8660aefb0b039dd8e6b9c6243b6e14c7645cbbaa..d534980b9e12bc40bfbe7bb344d3963b8c34af3e 100644 (file)
--- a/cat/CMakeLists.txt
+++ b/cat/CMakeLists.txt
@@ -33,8 +33,10 @@ IF(ENABLE_CAT)
   ENDIF(ENABLE_CAT_SHARED)
 
   # Installation rules
-  INSTALL(TARGETS bsdcat RUNTIME DESTINATION bin)
-  INSTALL_MAN(${bsdcat_MANS})
+  IF(ENABLE_INSTALL)
+    INSTALL(TARGETS bsdcat RUNTIME DESTINATION bin)
+    INSTALL_MAN(${bsdcat_MANS})
+  ENDIF(ENABLE_INSTALL)
 ENDIF(ENABLE_CAT)
 
 add_subdirectory(test)

diff --git a/cpio/CMakeLists.txt b/cpio/CMakeLists.txt
index f867bdf95f628e71d2ebb186fd7c1b9921ab34d3..2fee053bd4816d58a58574c342e338ecf9874c54 100644 (file)
--- a/cpio/CMakeLists.txt
+++ b/cpio/CMakeLists.txt
@@ -42,8 +42,10 @@ IF(ENABLE_CPIO)
   ENDIF(ENABLE_CPIO_SHARED)
 
   # Installation rules
-  INSTALL(TARGETS bsdcpio RUNTIME DESTINATION bin)
-  INSTALL_MAN(${bsdcpio_MANS})
+  IF(ENABLE_INSTALL)
+    INSTALL(TARGETS bsdcpio RUNTIME DESTINATION bin)
+    INSTALL_MAN(${bsdcpio_MANS})
+  ENDIF(ENABLE_INSTALL)
 
 ENDIF(ENABLE_CPIO)
 

diff --git a/libarchive/archive_write_set_format_zip.c b/libarchive/archive_write_set_format_zip.c
index b835695a5c46fa582a85cb0c521a817ce835557b..eaa1362a4050a3c355d0d8857b3723d912c159a0 100644 (file)
--- a/libarchive/archive_write_set_format_zip.c
+++ b/libarchive/archive_write_set_format_zip.c
@@ -1822,7 +1822,9 @@ archive_write_zip_finish_entry(struct archive_write *a)
 {
        struct zip *zip = a->format_data;
        int ret;
+#if defined(HAVE_BZLIB_H) || (defined(HAVE_ZSTD_H) && HAVE_ZSTD_compressStream) || HAVE_LZMA_H
        char finishing;
+#endif
 
        switch (zip->entry_compression) {
 #ifdef HAVE_ZLIB_H

diff --git a/tar/CMakeLists.txt b/tar/CMakeLists.txt
index a5b83454a38709363e34cae835ae10439ed02d7f..b09426945b9458aeddd3bcb8e956ec99a151fc8c 100644 (file)
--- a/tar/CMakeLists.txt
+++ b/tar/CMakeLists.txt
@@ -46,8 +46,10 @@ IF(ENABLE_TAR)
   ENDIF(ENABLE_TAR_SHARED)
 
   # Installation rules
-  INSTALL(TARGETS bsdtar RUNTIME DESTINATION bin)
-  INSTALL_MAN(${bsdtar_MANS})
+  IF(ENABLE_INSTALL)
+    INSTALL(TARGETS bsdtar RUNTIME DESTINATION bin)
+    INSTALL_MAN(${bsdtar_MANS})
+  ENDIF(ENABLE_INSTALL)
 ENDIF(ENABLE_TAR)
 
 add_subdirectory(test)

diff --git a/unzip/CMakeLists.txt b/unzip/CMakeLists.txt
index d229507a3de8632434be513a3d43a33adeeb7963..586245b67fd747bf720afe4e61fdd521480c0669 100644 (file)
--- a/unzip/CMakeLists.txt
+++ b/unzip/CMakeLists.txt
@@ -38,8 +38,10 @@ IF(ENABLE_UNZIP)
   ENDIF(ENABLE_UNZIP_SHARED)
 
   # Installation rules
-  INSTALL(TARGETS bsdunzip RUNTIME DESTINATION bin)
-  INSTALL_MAN(${bsdunzip_MANS})
+  IF(ENABLE_INSTALL)
+    INSTALL(TARGETS bsdunzip RUNTIME DESTINATION bin)
+    INSTALL_MAN(${bsdunzip_MANS})
+  ENDIF(ENABLE_INSTALL)
 ENDIF(ENABLE_UNZIP)
 
 add_subdirectory(test)