kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
32,679 Commits 1 Branch 14 Tags 53 MiB
Commit Graph

9 Commits

Author SHA1 Message Date
Brad King 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
Brad King 932848f420 Merge branch 'libarchive-upstream' into update-libarchive 
Resolve conflicts by integrating changes from both sides.
 2015-10-21 10:18:52 -04:00
Daniel Pfeifer 8436d18115 CMake: Enable use of liblzma in libarchive (#14504) 
Build liblzma as part of CMake or find one on the system.  Modify our
port of libarchive to use the liblzma configured for use with CMake.
 2014-07-29 08:45:36 -04:00
Brad King 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
Andreas Mohr ddac8d3d2d Fix spelling and typos (affecting binary data / module messages) 2013-05-07 08:39:19 -04:00
Brad King d4a9e334d3 Include bzlib.h consistently across CMake build (#10950) 
Use the approach originally used in commit f91b3c1d (Add options to
build with system utility libraries, 2006-10-19) for all other
third-party libraries.  Create a "cm_bzlib.h" header wrapper that
robustly includes the header from the bzip2 library chosen for the CMake
build (either builtin or system version).  Include the header wrapper
anywhere we need the API provided by <bzlib.h>.
 2012-01-13 14:05:36 -05:00
Brad King 156cb3bbf2 Merge branch 'libarchive-upstream' into update-libarchive 
Conflicts:
	Utilities/cmlibarchive/CMakeLists.txt
	Utilities/cmlibarchive/libarchive/archive_windows.c
 2012-01-05 09:02:58 -05:00
Brad King ffa6faa40d libarchive: Include cm_zlib.h to get zlib used by CMake 2011-12-22 10:38:37 -05:00
Brad King 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