e9bc469b2a
Merge branch 'upstream-LibArchive' into update-libarchive
...
Resolve conflicts in C code by taking their side. Resolve conflicts in
CMake code by integrating the changes.
2016-05-02 10:48:48 -04:00
932848f420
Merge branch 'libarchive-upstream' into update-libarchive
...
Resolve conflicts by integrating changes from both sides.
2015-10-21 10:18:52 -04:00
4533560c23
Merge branch 'libarchive-upstream' into update-libarchive
...
Resolve conflicts in Utilities/cmlibarchive/CMakeLists.txt as
appropriate.
2014-04-15 16:34:50 -04:00
2f1978632b
Merge branch 'libarchive-upstream' into update-libarchive
...
Resolve conflicts in favor of the upstream side where possible.
Resolve a logical conflict in archive_windows.h where the upstream
port to Watcom was done slightly differently from ours.
2014-04-03 15:02:49 -04:00
102071f80c
Merge branch 'libarchive-upstream' into update-libarchive
...
Conflicts:
Utilities/cmlibarchive/CMakeLists.txt
Utilities/cmlibarchive/libarchive/archive.h
Utilities/cmlibarchive/libarchive/archive_entry.h
Utilities/cmlibarchive/libarchive/archive_read_disk_posix.c
Utilities/cmlibarchive/libarchive/archive_read_support_format_iso9660.c
Utilities/cmlibarchive/libarchive/archive_windows.h
Utilities/cmlibarchive/libarchive/archive_write_set_format_iso9660.c
2013-07-31 08:19:13 -04:00
25a5e7cbc1
libarchive: Build one static cmlibarchive for CMake
...
CMake needs only a single static libarchive library and not a shared
one. Call it cmlibarchive to avoid confusion.
2011-12-22 10:38:36 -05:00
1d7ea8b629
libarchive: Do not build subdirectories not in reduced snapshot
...
Remove add_subdirectory() calls for directories not included in the
reduced libarchive snapshot. Remove options that configure settings in
the missing directories.
2011-12-22 10:38:34 -05:00
3e5a80f063
Merge branch 'libarchive-upstream' into update-libarchive
...
Add Utilities/cmlibarchive using upstream libarchive 3.0.0-r3950
snapshot.
2011-12-20 11:54:25 -05:00
f6ac86d70e
libarchive: Remove our copy to make room for new import
2011-12-20 11:47:27 -05:00
bc701c59de
link in additional libraries that the configure step finds
2009-11-07 10:52:40 -05:00
7a35b9ba3a
only use archive_entry_copy_bhfi.c on windows so we don't get empty .o file warnings
2009-10-30 17:01:49 -04:00
fb51d98562
Switch to using libarchive from libtar for cpack and cmake -E tar
...
This allows for a built in bzip and zip capability, so external tools
will not be needed for these packagers. The cmake -E tar xf should be
able to handle all compression types now as well.
2009-10-30 13:10:56 -04:00
Brad King
Bill Hoffman