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

4 Commits

Author SHA1 Message Date
Brad King 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
Brad King 677384017a libarchive: Include cm_zlib.h to get zlib used by CMake 
Follow up change from commit ffa6faa4 (libarchive: Include cm_zlib.h to
get zlib used by CMake, 2011-12-20) for new includes of zlib.h in
updated libarchive.
 2013-07-31 08:19:58 -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
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