summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge topic 'fix-Qt4-moc-commands-depends'Brad King2014-03-265-1/+58
|\
| * Qt4: Fix moc command dependencies for incremental build.Stephen Kelly2014-03-215-1/+58
* | Merge topic 'report-INTERFACE-type-in-conflict'Brad King2014-03-261-0/+3
|\ \
| * | cmMakefile: Report type of INTERFACE library in conflict.Stephen Kelly2014-03-201-0/+3
| |/
* | Merge topic 'UseJava-fix-resource-copy'Brad King2014-03-261-3/+5
|\ \
| * | UseJava: Copy resource files before compiling the jar (#13360)Bruno Nova2014-03-201-3/+5
| |/
* | Merge topic 'update-kwsys'Brad King2014-03-261-4/+9
|\ \
| * \ Merge branch 'upstream-kwsys' into update-kwsysBrad King2014-03-201-4/+9
| |\ \ | | |/ | |/|
| | * KWSys 2014-03-19 (a8aa1014)KWSys Robot2014-03-201-4/+9
* | | Merge topic 'compile-m-as-c'Brad King2014-03-262-2/+2
|\ \ \
| * | | Treat .m files consistently as C across all generatorsTim Blechmann2014-03-202-2/+2
| |/ /
* | | Merge topic 'UseSWIG-revert-bad-fix-0010080'Brad King2014-03-261-4/+3
|\ \ \
| * | | Revert "UseSWIG: Name extra generated files after module name (#10080)"Julien Schueller2014-03-201-4/+3
* | | | Merge branch 'release'Brad King2014-03-260-0/+0
|\ \ \ \
| * | | | CMake 3.0.0-rc3v3.0.0-rc3Brad King2014-03-201-1/+1
* | | | | CMake Nightly Date StampKitware Robot2014-03-261-1/+1
* | | | | CMake Nightly Date StampKitware Robot2014-03-251-1/+1
* | | | | CMake Nightly Date StampKitware Robot2014-03-241-1/+1
* | | | | CMake Nightly Date StampKitware Robot2014-03-231-1/+1
* | | | | CMake Nightly Date StampKitware Robot2014-03-221-1/+1
* | | | | CMake Nightly Date StampKitware Robot2014-03-211-1/+1
| |_|/ / |/| | |
* | | | Merge branch 'release'Brad King2014-03-200-0/+0
|\ \ \ \ | |/ / /
| * | | Merge branch 'add_custom_command-no-INTERFACE-lib' into releaseBrad King2014-03-196-1/+23
| |\ \ \
| * \ \ \ Merge branch 'fix-Qt5-non-Windows' into releaseBrad King2014-03-191-1/+1
| |\ \ \ \
* | \ \ \ \ Merge topic 'watcom-updates'Brad King2014-03-2010-28/+89
|\ \ \ \ \ \
| * | | | | | Watcom: Enable 'WMake Makefiles' generator on LinuxJiri Malak2014-03-173-4/+20
| * | | | | | Watcom: Introduce OpenWatcom compiler id and fix compiler versionJiri Malak2014-03-175-24/+40
| * | | | | | Watcom: Detect compiler target architecture and platformJiri Malak2014-03-171-0/+28
| * | | | | | Watcom: Add one blank line to Makefile for better readabilityJiri Malak2014-03-171-0/+1
* | | | | | | Merge topic 'configure_file-unicode'Brad King2014-03-2025-0/+69
|\ \ \ \ \ \ \
| * | | | | | | Unicode: check encoding of files given to configure_file.Clinton Stimpson2014-03-1725-0/+69
* | | | | | | | Merge topic 'ExternalProject-no-download-progress'Brad King2014-03-203-3/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | Help: Add notes for topic 'ExternalProject-no-download-progress'Brad King2014-03-171-0/+6
| * | | | | | | | ExternalProject: Add option to disable download progress (#14807)Brad King2014-03-172-3/+12
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge topic 'FindPkgConfig_Extend-PKG_CONFIG_PATH_2'Brad King2014-03-208-27/+182
|\ \ \ \ \ \ \ \
| * | | | | | | | FindPkgConfig: More unit testsDaniele E. Domenichelli2014-03-177-3/+151
| * | | | | | | | FindPkgConfig: small refactoringDaniele E. Domenichelli2014-03-171-24/+31
| |/ / / / / / /
* | | | | | | | Merge topic 'CheckTypeSize_#14056'Brad King2014-03-203-3/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | CheckTypeSize: Add unit test to cover the no-C caseDaniele E. Domenichelli2014-03-172-0/+6
| * | | | | | | | CheckTypeSize: Support for CXX when C language is not enabledDaniele E. Domenichelli2014-03-151-3/+10
* | | | | | | | | Merge topic 'file-DOWNLOAD-cap-progress'Brad King2014-03-201-0/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | file: Avoid runaway DOWNLOAD/UPLOAD progress reports (#14807)Brad King2014-03-171-0/+5
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge topic 'minor_cleanups'Brad King2014-03-206-40/+21
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | cmMakefile: Fix style.Stephen Kelly2014-03-171-1/+1
| * | | | | | | | | cmMakefile: Fix typo in comment.Stephen Kelly2014-03-171-1/+1
| * | | | | | | | | Makefiles: Remove duplicate code.Stephen Kelly2014-03-172-18/+1
| * | | | | | | | | cmGeneratorExpression: Remove unused include.Stephen Kelly2014-03-171-2/+0
| * | | | | | | | | Rename local 'dir_max' variables to 'dir'Stephen Kelly2014-03-173-18/+18
| |/ / / / / / / /
* | | | | | | | | Merge topic 'fix-AllFindModules-test-module-path'Brad King2014-03-201-0/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Tests: Teach CMakeOnly.AllFindModules to tolerate a system KDE4Brad King2014-03-191-0/+3