File tree 6 files changed +26
-14
lines changed 6 files changed +26
-14
lines changed Original file line number Diff line number Diff line change @@ -378,10 +378,12 @@ ENDMACRO (GENERATE_LIST_H)
378
378
# Generate installation rules for man pages.
379
379
#
380
380
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)
385
387
ENDMACRO (INSTALL_MAN __mans)
386
388
#
387
389
# Find out what macro is needed to use libraries on Windows.
@@ -2176,7 +2178,7 @@ INCLUDE(CreatePkgConfigFile)
2176
2178
#
2177
2179
# Register installation of PDF documents.
2178
2180
#
2179
- IF (WIN32 AND NOT CYGWIN )
2181
+ IF (WIN32 AND NOT CYGWIN AND ENABLE_INSTALL )
2180
2182
#
2181
2183
# On Windows platform, It's better that we install PDF documents
2182
2184
# on one's computer.
@@ -2188,7 +2190,7 @@ IF(WIN32 AND NOT CYGWIN)
2188
2190
FILES_MATCHING PATTERN "*.pdf"
2189
2191
)
2190
2192
ENDIF (EXISTS ${CMAKE_CURRENT_SOURCE_DIR} /doc /pdf)
2191
- ENDIF (WIN32 AND NOT CYGWIN )
2193
+ ENDIF (WIN32 AND NOT CYGWIN AND ENABLE_INSTALL )
2192
2194
#
2193
2195
#
2194
2196
#
Original file line number Diff line number Diff line change @@ -33,8 +33,10 @@ IF(ENABLE_CAT)
33
33
ENDIF (ENABLE_CAT_SHARED)
34
34
35
35
# 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)
38
40
ENDIF (ENABLE_CAT)
39
41
40
42
add_subdirectory (test )
Original file line number Diff line number Diff line change @@ -42,8 +42,10 @@ IF(ENABLE_CPIO)
42
42
ENDIF (ENABLE_CPIO_SHARED)
43
43
44
44
# 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)
47
49
48
50
ENDIF (ENABLE_CPIO)
49
51
Original file line number Diff line number Diff line change @@ -1822,7 +1822,9 @@ archive_write_zip_finish_entry(struct archive_write *a)
1822
1822
{
1823
1823
struct zip * zip = a -> format_data ;
1824
1824
int ret ;
1825
+ #if defined(HAVE_BZLIB_H ) || (defined(HAVE_ZSTD_H ) && HAVE_ZSTD_compressStream ) || HAVE_LZMA_H
1825
1826
char finishing ;
1827
+ #endif
1826
1828
1827
1829
switch (zip -> entry_compression ) {
1828
1830
#ifdef HAVE_ZLIB_H
Original file line number Diff line number Diff line change @@ -46,8 +46,10 @@ IF(ENABLE_TAR)
46
46
ENDIF (ENABLE_TAR_SHARED)
47
47
48
48
# 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)
51
53
ENDIF (ENABLE_TAR)
52
54
53
55
add_subdirectory (test )
Original file line number Diff line number Diff line change @@ -38,8 +38,10 @@ IF(ENABLE_UNZIP)
38
38
ENDIF (ENABLE_UNZIP_SHARED)
39
39
40
40
# 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)
43
45
ENDIF (ENABLE_UNZIP)
44
46
45
47
add_subdirectory (test )
You can’t perform that action at this time.
0 commit comments