summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge topic 'vs-refactor-source-tools'Brad King2014-07-302-21/+54
|\
| * VS: Map .jpg and .png sources to Image toolBrad King2014-07-291-0/+5
| * VS: Map .xml to XML toolBrad King2014-07-291-0/+4
| * VS: Map .appxmanifest sources to AppxManifest toolBrad King2014-07-291-1/+7
| * VS: Refactor handling of resx headersBrad King2014-07-291-14/+12
| * VS: Refactor handling of "header" sources in VS >= 10Brad King2014-07-292-1/+11
| * VS: Refactor handling of "extra" sources in VS >= 10Brad King2014-07-292-1/+11
| * VS: Convert 'WriteSource' tool argument to std::stringBrad King2014-07-292-6/+6
* | Merge topic 'ExternalProject-add-lzma'Brad King2014-07-302-5/+10
|\ \
| * | ExternalProject: Recognize lzma-compressed files (#13515)Brad King2014-07-292-5/+10
| * | ExternalProject: Recognize .tbz2 extensionBrad King2014-07-291-5/+5
| |/
* | Merge topic 'cpack-add-lzma'Brad King2014-07-309-2/+151
|\ \
| * | CPack: add generators for .7z and .tar.xz (#13072, #14519)Daniel Pfeifer2014-07-299-2/+151
| |/
* | CMake Nightly Date StampKitware Robot2014-07-301-1/+1
|/
* Merge topic 'vs10-system-hook'Brad King2014-07-292-0/+15
|\
| * VS: Add a hook to adapt to SystemName and SystemVersionBrad King2014-07-282-0/+11
| * VS: Save system name and version in global generator membersBrad King2014-07-282-0/+4
* | Merge topic 'vs10-comment-typo'Brad King2014-07-291-1/+1
|\ \
| * | cmGlobalVisualStudio10Generator: Fix typo KHLM => HKLMGilles Khouzam2014-07-281-1/+1
| |/
* | Merge topic 'windows-ce-cleanup'Brad King2014-07-293-5/+5
|\ \
| * | WindowsCE: Drop unused Platform/WindowsCE-MSVC moduleBrad King2014-07-281-1/+0
| * | WindowsCE: Refactor setting of "WINCE"Brad King2014-07-282-3/+4
| * | MSVC: Use STREQUAL to check for WindowsCEBrad King2014-07-281-1/+1
| |/
* | Merge topic 'fix-qthelp-windows'Brad King2014-07-291-2/+7
|\ \
| * | Help: Fix QtHelp commands on WindowsNils Gladitz2014-07-281-2/+7
| |/
* | Merge topic 'xcode-6-librarian-flags'Brad King2014-07-292-5/+24
|\ \
| * | Xcode: Fix static library creation for Xcode 6 (#15038)Brad King2014-07-282-5/+24
* | | Merge topic 'doc-tll-flags'Brad King2014-07-291-1/+4
|\ \ \
| * | | Help: Clarify target_link_libraries treatment of flags (#15034)Brad King2014-07-281-1/+4
| | |/ | |/|
* | | Merge topic 'osx-no-sysroot-for-deployment'Brad King2014-07-291-0/+2
|\ \ \
| * | | OS X: Allow deployment target with "/" sysroot (#15040)Jeremy Huddleston2014-07-281-0/+2
* | | | Merge topic 'FindQt4-more-plugins'Brad King2014-07-291-3/+3
|\ \ \ \
| * | | | FindQt4: Add nativewifi and qtga pluginsMathieu MARACHE2014-07-281-3/+3
| | |_|/ | |/| |
* | | | Merge topic 'add-liblzma'Brad King2014-07-29156-18/+26885
|\ \ \ \
| * | | | Help: Add notes for topic 'add-liblzma'Brad King2014-07-291-0/+5
| * | | | CMake: Enable use of liblzma in libarchive (#14504)Daniel Pfeifer2014-07-2912-18/+66
| * | | | liblzma: Avoid defining a 'restrict' macroBrad King2014-07-2931-101/+103
| * | | | liblzma: Disable warnings to avoid changing 3rd party codeBrad King2014-07-292-1/+13
| * | | | liblzma: Port to VS 6, 7.0Daniel Pfeifer2014-07-292-17/+10
| * | | | liblzma: Port from C99 to C89/90Daniel Pfeifer2014-07-2961-700/+1080
| * | | | liblzma: Add CMake build systemDaniel Pfeifer2014-07-237-8/+491
| * | | | liblzma: Remove unused Makefile.* filesBrad King2014-07-239-387/+0
| * | | | liblzma: Add README-CMake.txtBrad King2014-07-231-0/+66
| * | | | Merge branch 'liblzma-upstream' into add-liblzmaBrad King2014-07-21148-0/+26264
| |\ \ \ \
| | * | | | liblzma 5.0.5-gb69900ed (reduced)liblzma upstream2014-07-21148-0/+26264
| | / / /
| * | | | liblzma: Add .gitattributes to ignore whitespace checksBrad King2014-07-211-0/+1
* | | | | CMake Nightly Date StampKitware Robot2014-07-291-1/+1
| |_|_|/ |/| | |
* | | | Merge branch 'release'Brad King2014-07-280-0/+0
|\ \ \ \
| * \ \ \ Merge branch 'backport-kwsys-qnx-fix' into releaseBrad King2014-07-171-1/+4
| |\ \ \ \
| * \ \ \ \ Merge branch 'compile-with-cray' into releaseBrad King2014-07-171-1/+1
| |\ \ \ \ \