summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | 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
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'fix-QCC-compile-flags' into releaseBrad King2014-07-176-27/+41
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge topic 'sanitizer_handle_more_pids'Brad King2014-07-283-11/+27
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Handle more than one process with sanitizer errors.Bill Hoffman2014-07-243-11/+27
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge topic 'fix-re-cmake-with-compiler'Brad King2014-07-282-5/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | CMakeDetermineCompiler: Simplify CMAKE_<LANG>_COMPILER default force-cacheBrad King2014-07-241-1/+1
| * | | | | | | | | cmGlobalGenerator: Do not re-add CMAKE_<LANG>_COMPILERBrad King2014-07-241-4/+0
* | | | | | | | | | Merge topic 'fix_qt4_automoc_leak'Brad King2014-07-281-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix memory leak of local generator detected by LeakSanitizer.Bill Hoffman2014-07-241-0/+1
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge topic 'cpack-ifw-generator'Brad King2014-07-2814-0/+1411
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Help: Add notes for topic 'cpack-ifw-generator'Brad King2014-07-281-0/+5
| * | | | | | | | | | CPackIFW: Replace use of strftime with cmTimestampBrad King2014-07-281-10/+3
| * | | | | | | | | | CPack: Add an "IFW" generator for Qt Framework InstallerKonstantin Podsvirov2014-07-2813-0/+1413
* | | | | | | | | | | Merge topic 'FindImageMagick-arch-include-dir'Brad King2014-07-281-2/+26
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | FindImageMagick: Provide per-component include dirs (#15007)Brad King2014-07-231-2/+9
| * | | | | | | | | | | FindImageMagick: Find arch include dir (#15007)bastien ROUCARIES2014-07-231-1/+18
* | | | | | | | | | | | Merge topic 'vs-escaping'Brad King2014-07-286-65/+89
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | VS: Encode more content correctly in vcxproj files (#15031)Brad King2014-07-231-13/+16