summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Genex: Add a test for the LINK_ONLY expression.Stephen Kelly2013-11-064-5/+17
* Merge branch 'release'Brad King2013-11-061-0/+26
|\
| * CMake 2.8.12.1v2.8.12.1Brad King2013-11-052-1/+27
| * Merge branch 'fix-automoc-compile-definitions' into releaseBrad King2013-11-053-5/+25
| |\
| * \ Merge branch 'cmake-E-automoc-crash' into releaseBrad King2013-11-051-1/+1
| |\ \
| * \ \ Merge branch 'clear-evaluation-files' into releaseBrad King2013-11-041-0/+8
| |\ \ \
| * \ \ \ Merge branch 'policy-CMP0022-fixes' into releaseBrad King2013-11-0426-126/+293
| |\ \ \ \
| * \ \ \ \ Merge branch 'object-library-no-TARGET_FILE' into releaseBrad King2013-11-026-1/+36
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'object-library-missing-source' into releaseBrad King2013-11-025-0/+13
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'vs12-parallel-cl-FS' into releaseBrad King2013-11-023-1/+7
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'FindCUDA-NPP-5.5' into releaseBrad King2013-11-021-1/+16
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge topic 'doc-html-page-layout'Brad King2013-11-065-4/+22
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Help: Configure html faviconBrad King2013-11-052-0/+1
| * | | | | | | | | | Help: Configure html page navigation barsBrad King2013-11-053-0/+17
| * | | | | | | | | | Help: Configure |version| replacement correctlyBrad King2013-11-041-1/+1
| * | | | | | | | | | Help: Configure copyright year automaticallyBrad King2013-11-042-3/+3
* | | | | | | | | | | Merge topic 'refactor-autogen-setup'Brad King2013-11-064-89/+114
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | cmAutogen: Gather tool arguments after creating generator targets.Stephen Kelly2013-11-052-10/+18
| * | | | | | | | | | | cmAutogen: Rename method to InitializeAutogenTargetStephen Kelly2013-11-053-3/+3
| * | | | | | | | | | | cmAutogen: Move autogen target creation to InitializeMocSourceFile.Stephen Kelly2013-11-051-67/+72
| * | | | | | | | | | | cmAutogen: Extract some helper methods for autogen targets.Stephen Kelly2013-11-051-9/+21
* | | | | | | | | | | | Merge topic 'clear-generator-data'Brad King2013-11-062-48/+38
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | cmGlobalGenerator: Refactor member cleanup between configuresBrad King2013-11-052-48/+38
* | | | | | | | | | | | | CMake Nightly Date StampKitware Robot2013-11-061-1/+1
| |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge topic 'fix-automoc-compile-definitions'Brad King2013-11-053-5/+25
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | Automoc: Add directory-level COMPILE_DEFINITIONS to command line (#14535)Stephen Kelly2013-11-053-5/+25
* | | | | | | | | | | | Merge topic 'osx-no-PackageMaker'Brad King2013-11-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | CPack: Disable OS X PackageMaker by default (#13662)Brad King2013-11-011-1/+1
* | | | | | | | | | | | | Merge topic 'test-Assembler-no-g'Brad King2013-11-051-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Tests/Assembler: Drop -g when generating sample assembly sourceBrad King2013-11-011-0/+3
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge topic 'cmake-E-autogen-crash'Brad King2013-11-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | cmake: Validate -E cmake_autogen argument count (#14545)Brad King2013-11-051-1/+1
| * | | | | | | | | | | | | Merge branch 'cmake-E-automoc-crash' into cmake-E-autogen-crashBrad King2013-11-050-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| | * | | | | | | | | | | cmake: Validate -E cmake_automoc argument count (#14545)Brad King2013-11-051-1/+1
| | | |/ / / / / / / / / | | |/| | | | | | | | |
* | | | | | | | | | | | Merge topic 'remove-cmake-i-wizard'Brad King2013-11-052-3/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Help: Drop mention of cmake -i wizard modeBrad King2013-11-042-3/+2
* | | | | | | | | | | | | Merge topic 'doc-tool-usage'Brad King2013-11-055-14/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Help: Refine manual/*.1.rst usage summariesBrad King2013-11-045-14/+28
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge topic 'FindPHP4-no-cache-output'Brad King2013-11-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | FindPHP4: Drop extra content from reported PHP4_INCLUDE_PATH (#14540)Brad King2013-11-041-1/+1
* | | | | | | | | | | | | | Merge topic 'FindJNI-biarch'Brad King2013-11-051-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | FindJNI: Support biarch installations (#14541)Modestas Vainius2013-11-041-2/+2
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge topic 'ninja-dont-parse-empty-depsflag'Brad King2013-11-051-5/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Ninja: don't parse empty stringPeter Kümmel2013-11-041-5/+8
* | | | | | | | | | | | | | | Merge topic 'ninja-deps-intel'Brad King2013-11-052-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Ninja: add depfile support for Intel's compilerPeter Kümmel2013-11-042-0/+4
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge topic 'clear-evaluation-files'Brad King2013-11-051-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | file(GENERATE): Clear internal records between configuresBrad King2013-11-041-0/+8
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | CMake Nightly Date StampKitware Robot2013-11-051-1/+1
| |_|_|/ / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge topic 'policy-CMP0022-fixes-for-master'Brad King2013-11-043-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |