CMake.git - CMake is a cross-platform, open-source build system generator.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'upstream-LibArchive' into update-libarchive	Brad King	2020-02-13	1	-3/+6
\| \| \| \| \| \| \| \| \| \|	* upstream-LibArchive: LibArchive 2020-02-11 (3288ebb0) Also manually restore content from upstream libarchive's main `CMakeLists.txt` file that was removed by previous commits and exclude it with `IF(0)` blocks. Do this as an evil merge so that `git blame -C` can follow the content to upstream.
*	Merge branch 'upstream-LibArchive' into update-libarchive	Brad King	2017-02-20	1	-2/+1
\| \| \| \| \|	* upstream-LibArchive: LibArchive 2017-02-19 (100ee75a)
*	Merge branch 'libarchive-upstream' into update-libarchive	Brad King	2015-10-21	1	-18/+25
\| \| \| \|	Resolve conflicts by integrating changes from both sides.
*	Merge branch 'libarchive-upstream' into update-libarchive	Brad King	2014-04-15	1	-1/+10
\| \| \| \| \|	Resolve conflicts in Utilities/cmlibarchive/CMakeLists.txt as appropriate.
*	Merge branch 'libarchive-upstream' into update-libarchive	Brad King	2014-04-03	1	-9/+13
\| \| \| \| \| \|	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.
*	Merge branch 'libarchive-upstream' into update-libarchive	Brad King	2013-07-31	1	-5/+39
\| \| \| \| \| \| \| \| \| \| \|	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
*	Merge branch 'libarchive-upstream' into update-libarchive	Brad King	2011-12-20	1	-0/+210
\| \| \| \| \|	Add Utilities/cmlibarchive using upstream libarchive 3.0.0-r3950 snapshot.
*	libarchive: Remove our copy to make room for new import	Brad King	2011-12-20	1	-199/+0
\|
*	Switch to using libarchive from libtar for cpack and cmake -E tar	Bill Hoffman	2009-10-30	1	-0/+199
	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.