Skip to content

Commit 4ebca5f

Browse files
authored
Fix -Werror=warning error and wrap some INSTALL directives with an ENABLE_INSTALL guard (#2397)
1. Fixes build when compiling without ZLIB/BZIP/LZMA `char finishing` 2. All INSTALL directives are now guarded by ENABLE_INSTALL
1 parent e6d8a47 commit 4ebca5f

File tree

6 files changed

+26
-14
lines changed

6 files changed

+26
-14
lines changed

CMakeLists.txt

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -378,10 +378,12 @@ ENDMACRO (GENERATE_LIST_H)
378378
# Generate installation rules for man pages.
379379
#
380380
MACRO (INSTALL_MAN __mans)
381-
FOREACH (_man ${ARGV})
382-
STRING(REGEX REPLACE "^.+[.]([1-9])" "\\1" _mansect ${_man})
383-
INSTALL(FILES ${_man} DESTINATION "share/man/man${_mansect}")
384-
ENDFOREACH (_man)
381+
IF(ENABLE_INSTALL)
382+
FOREACH (_man ${ARGV})
383+
STRING(REGEX REPLACE "^.+[.]([1-9])" "\\1" _mansect ${_man})
384+
INSTALL(FILES ${_man} DESTINATION "share/man/man${_mansect}")
385+
ENDFOREACH (_man)
386+
ENDIF(ENABLE_INSTALL)
385387
ENDMACRO (INSTALL_MAN __mans)
386388
#
387389
# Find out what macro is needed to use libraries on Windows.
@@ -2176,7 +2178,7 @@ INCLUDE(CreatePkgConfigFile)
21762178
#
21772179
# Register installation of PDF documents.
21782180
#
2179-
IF(WIN32 AND NOT CYGWIN)
2181+
IF(WIN32 AND NOT CYGWIN AND ENABLE_INSTALL)
21802182
#
21812183
# On Windows platform, It's better that we install PDF documents
21822184
# on one's computer.
@@ -2188,7 +2190,7 @@ IF(WIN32 AND NOT CYGWIN)
21882190
FILES_MATCHING PATTERN "*.pdf"
21892191
)
21902192
ENDIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/doc/pdf)
2191-
ENDIF(WIN32 AND NOT CYGWIN)
2193+
ENDIF(WIN32 AND NOT CYGWIN AND ENABLE_INSTALL)
21922194
#
21932195
#
21942196
#

cat/CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,10 @@ IF(ENABLE_CAT)
3333
ENDIF(ENABLE_CAT_SHARED)
3434

3535
# Installation rules
36-
INSTALL(TARGETS bsdcat RUNTIME DESTINATION bin)
37-
INSTALL_MAN(${bsdcat_MANS})
36+
IF(ENABLE_INSTALL)
37+
INSTALL(TARGETS bsdcat RUNTIME DESTINATION bin)
38+
INSTALL_MAN(${bsdcat_MANS})
39+
ENDIF(ENABLE_INSTALL)
3840
ENDIF(ENABLE_CAT)
3941

4042
add_subdirectory(test)

cpio/CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,10 @@ IF(ENABLE_CPIO)
4242
ENDIF(ENABLE_CPIO_SHARED)
4343

4444
# Installation rules
45-
INSTALL(TARGETS bsdcpio RUNTIME DESTINATION bin)
46-
INSTALL_MAN(${bsdcpio_MANS})
45+
IF(ENABLE_INSTALL)
46+
INSTALL(TARGETS bsdcpio RUNTIME DESTINATION bin)
47+
INSTALL_MAN(${bsdcpio_MANS})
48+
ENDIF(ENABLE_INSTALL)
4749

4850
ENDIF(ENABLE_CPIO)
4951

libarchive/archive_write_set_format_zip.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1822,7 +1822,9 @@ archive_write_zip_finish_entry(struct archive_write *a)
18221822
{
18231823
struct zip *zip = a->format_data;
18241824
int ret;
1825+
#if defined(HAVE_BZLIB_H) || (defined(HAVE_ZSTD_H) && HAVE_ZSTD_compressStream) || HAVE_LZMA_H
18251826
char finishing;
1827+
#endif
18261828

18271829
switch (zip->entry_compression) {
18281830
#ifdef HAVE_ZLIB_H

tar/CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,10 @@ IF(ENABLE_TAR)
4646
ENDIF(ENABLE_TAR_SHARED)
4747

4848
# Installation rules
49-
INSTALL(TARGETS bsdtar RUNTIME DESTINATION bin)
50-
INSTALL_MAN(${bsdtar_MANS})
49+
IF(ENABLE_INSTALL)
50+
INSTALL(TARGETS bsdtar RUNTIME DESTINATION bin)
51+
INSTALL_MAN(${bsdtar_MANS})
52+
ENDIF(ENABLE_INSTALL)
5153
ENDIF(ENABLE_TAR)
5254

5355
add_subdirectory(test)

unzip/CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,10 @@ IF(ENABLE_UNZIP)
3838
ENDIF(ENABLE_UNZIP_SHARED)
3939

4040
# Installation rules
41-
INSTALL(TARGETS bsdunzip RUNTIME DESTINATION bin)
42-
INSTALL_MAN(${bsdunzip_MANS})
41+
IF(ENABLE_INSTALL)
42+
INSTALL(TARGETS bsdunzip RUNTIME DESTINATION bin)
43+
INSTALL_MAN(${bsdunzip_MANS})
44+
ENDIF(ENABLE_INSTALL)
4345
ENDIF(ENABLE_UNZIP)
4446

4547
add_subdirectory(test)

0 commit comments

Comments
 (0)