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	2018-09-26	1	-5/+7
\| \| \| \| \|	* upstream-LibArchive: LibArchive 2018-09-03 (5fe69dd0)
*	Merge branch 'upstream-LibArchive' into update-libarchive	Brad King	2017-07-20	1	-1/+2
\| \| \| \| \|	* upstream-LibArchive: LibArchive 2017-07-09 (98a69539)
*	Merge branch 'upstream-LibArchive' into update-libarchive	Brad King	2017-02-20	1	-7/+9
\| \| \| \| \|	* upstream-LibArchive: LibArchive 2017-02-19 (100ee75a)
*	Merge branch 'upstream-LibArchive' into update-libarchive	Brad King	2016-05-02	1	-2/+6
\| \| \| \| \|	Resolve conflicts in C code by taking their side. Resolve conflicts in CMake code by integrating the changes.
*	Merge branch 'libarchive-upstream' into update-libarchive	Brad King	2015-10-21	1	-19/+55
\| \| \| \|	Resolve conflicts by integrating changes from both sides.
*	Merge branch 'libarchive-upstream' into update-libarchive	Brad King	2014-04-03	1	-5/+61
\| \| \| \| \| \|	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	-62/+360
\| \| \| \| \| \| \| \| \| \| \|	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	2012-01-05	1	-16/+0
\| \| \| \| \| \|	Conflicts: Utilities/cmlibarchive/CMakeLists.txt Utilities/cmlibarchive/libarchive/archive_windows.c
*	libarchive: Avoid bogus conversion warning from PGI compiler	Brad King	2012-01-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We cannot suppress PGI compiler warnings completely because even with the "-w" flag the compiler still writes a message containing "compilation completed with warnings" to stderr. A warning is triggered by expressions like test ? NULL : ptr_to_const_char test ? ".." : ptr_to_const_char that the PGI compiler handles incorrectly. It chooses the pointer type of the first option (either void* or char*) and warns about conversion of the second without a cast. Flip the expression logic to !test ? ptr_to_const_char : NULL !test ? ptr_to_const_char : ".." to help the compiler choose the proper result type.
*	Merge branch 'libarchive-upstream' into update-libarchive	Brad King	2011-12-20	1	-0/+1358
\| \| \| \| \|	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	-1241/+0
\|
*	Remove another c++ comment from the c code.	Bill Hoffman	2010-04-28	1	-1/+1
\|
*	libarchive: Use consistent function storage class	Brad King	2009-11-04	1	-1/+1
\| \| \| \|	Functions declared 'static' should be defined 'static' too.
*	Switch to using libarchive from libtar for cpack and cmake -E tar	Bill Hoffman	2009-10-30	1	-0/+1241
	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.