summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'doc-rst-note-and-productionlist'Brad King2013-11-025-0/+38
|\ | | | | | | | | 450b515 cmRST: Add support for the note and productionlist directives
| * cmRST: Add support for the note and productionlist directivesBrad King2013-10-305-0/+38
| | | | | | | | | | | | Simply print out the lines as normal paragraph text. Teach the CMakeLib.testRST test to cover this syntax. Update the cmake-developer.7 manual to document support for the directives.
* | Merge topic 'revert-accidental-changes'Brad King2013-11-022-20/+4
|\ \ | | | | | | | | | | | | | | | 13aea6d cmFindCommon: Revert accidental change 4064d6f target_link_libraries: Revert accidental change
| * | cmFindCommon: Revert accidental changeBrad King2013-11-021-13/+2
| | | | | | | | | | | | | | | | | | | | | In commit c4373b33 (cmTarget: Make GetProperty() const, 2013-10-29) we accidentally changed the cmFindCommon.cxx logic in a way that looks like a local experiment leftover that went unnoticed due to the size of the other changes in the commit. Revert it.
| * | target_link_libraries: Revert accidental changeBrad King2013-11-021-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | In commit c4373b33 (cmTarget: Make GetProperty() const, 2013-10-29) we accidentally changed the cmTargetLinkLibrariesCommand.cxx logic in a way that looks like a local experiment leftover that went unnoticed due to the size of the other changes in the commit. Revert it.
* | | CMake Nightly Date StampKitware Robot2013-11-021-1/+1
| | |
* | | Merge topic 'doc-manual-toctree-depth'Brad King2013-11-016-0/+36
|\ \ \ | | | | | | | | | | | | | | | | c76e44e Help: Limit reference manual toctree depth to 1
| * | | Help: Limit reference manual toctree depth to 1Brad King2013-11-016-0/+36
|/ / / | | | | | | | | | | | | | | | Add a :maxdepth: option to all toctree directives to limit their depth to 1. We do not want subheadings from individual documents to pollute the already large lists of CMake Domain objects.
* | | Merge topic 'fix-duplicate-test-run'Brad King2013-11-011-1/+8
|\ \ \ | | | | | | | | | | | | | | | | 2eccdbd CTest: prevent tests from being inserted in the cost list twice
| * | | CTest: prevent tests from being inserted in the cost list twiceNils Gladitz2013-10-311-1/+8
| | | |
* | | | Merge topic 'add-CMAKE_FIND_NO_INSTALL_PREFIX'Brad King2013-11-0114-9/+78
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | fe057ab Allow disabling adding the install prefix to the prefix search path.
| * | | | Allow disabling adding the install prefix to the prefix search path.Stephen Kelly2013-10-3114-9/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In certain scenarios, it is preferable to keep a 'dirty' install prefix than to clear it, and to expect that content will not be found there. Add a CMAKE_FIND_NO_INSTALL_PREFIX variable that can be set to disable searching the install prefix.
* | | | | Merge topic 'constify'Brad King2013-11-0119-233/+273
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | c4373b3 cmTarget: Make GetProperty() const. cfb6661 Don't call SetProperty from GetProperty.
| * | | | cmTarget: Make GetProperty() const.Stephen Kelly2013-10-3119-229/+263
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has follow-on effects for other methods and classes. Further work on making the use of const cmTarget pointers common can be done, particularly with a view to generate-time methods.
| * | | | Don't call SetProperty from GetProperty.Stephen Kelly2013-10-301-4/+10
| | | | | | | | | | | | | | | | | | | | Memoize with the internal container directly instead.
* | | | | Merge topic 'cmake-syntax-recorded-brackets'Brad King2013-11-018-49/+80
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b54dbeb Test foreach/function/macro handling of bracket arguments ccdf7e0 macro: Do not substitute for placeholders in bracket arguments 999abb9 macro: Add extra indentation to placeholder substitution code
| * | | | | Test foreach/function/macro handling of bracket argumentsBrad King2013-10-307-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bracket arguments recorded in command invocations inside foreach, function, and macro blocks should not have any replacements done when the arguments are replayed later. Teach the RunCMake.Syntax test to cover these cases.
| * | | | | macro: Do not substitute for placeholders in bracket argumentsBrad King2013-10-301-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the macro command implementation to avoid substituting macro placeholders in bracket arguments recorded inside the macro block.
| * | | | | macro: Add extra indentation to placeholder substitution codeBrad King2013-10-301-51/+51
| |/ / / / | | | | | | | | | | | | | | | | | | | | The next commit will make this block conditional so pre-indent it to clarify the simplicity of the change.
* | | | | CMake Nightly Date StampKitware Robot2013-11-011-1/+1
| |_|/ / |/| | |
* | | | Merge topic 'use-generator-target'Brad King2013-10-316-321/+320
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 07f5788 Move TraceDependencies to cmGeneratorTarget. fa03777 Do not populate SourceEntries in AddSourceFile.
| * | | | Move TraceDependencies to cmGeneratorTarget.Stephen Kelly2013-10-306-317/+318
| | | | |
| * | | | Do not populate SourceEntries in AddSourceFile.Stephen Kelly2013-10-301-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It only generates a default constructed SourceEntry for each cmSourceFile. this->Internal->SourceEntries[sf]; in cmTargetTraceDependencies::Trace has the same effect, and is called early in generation-time for each source file anyway.
* | | | | Merge topic 'fix-ninja-launcher-errors-from-custom'Brad King2013-10-317-2/+125
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4fcb97e Tests: Add test for CTEST_USE_LAUNCHERS capture of custom commands 05c7042 Ninja: run custom commands through launcher if available
| * | | | | Tests: Add test for CTEST_USE_LAUNCHERS capture of custom commandsNils Gladitz2013-10-315-0/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This new test detects if custom command failures are detected with launchers.
| * | | | | Ninja: run custom commands through launcher if availableNils Gladitz2013-10-312-2/+43
| | | | | |
* | | | | | Merge topic 'vs-generator-names'Brad King2013-10-3115-93/+208
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 29071fe VS: Add version year to generator names
| * | | | | | VS: Add version year to generator namesBrad King2013-10-2815-93/+208
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename the Visual Studio >= 10 generators to indicate the version year: Visual Studio 10 => Visual Studio 10 2010 Visual Studio 11 => Visual Studio 11 2012 Visual Studio 12 => Visual Stduio 12 2013 Report the names with the year to the list of available generators so that the cmake-gui drop-down shows the years. When selecting a generator from the "-G" option or from an existing CMAKE_GENERATOR cache entry, recognize names without the years for compatibility and map them to the names with years. Update the generator names in the cmake-generators.7 manual.
* | | | | | | CMake Nightly Date StampKitware Robot2013-10-311-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | Merge topic 'use-generator-target'Brad King2013-10-307-95/+127
|\ \ \ \ \ \ | | |_|/ / / | |/| | | / | |_|_|_|/ |/| | | | | | | | | | | | | | 638843a Remove the Location member from cmTarget. 90ef1cf Move GenerateTargetManifest to cmGeneratorTarget. 25f1df3 Split CreateGeneratorTargets into two methods.
| * | | | Remove the Location member from cmTarget.Stephen Kelly2013-10-292-13/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is never used. Presumably it only exists so that a const char * can be returned from GetLocation. However, that is getting in the way now, so use a static std::string instead, which is already a common pattern in cmake.
| * | | | Move GenerateTargetManifest to cmGeneratorTarget.Stephen Kelly2013-10-275-76/+83
| | | | |
| * | | | Split CreateGeneratorTargets into two methods.Stephen Kelly2013-10-274-6/+25
| | | | | | | | | | | | | | | | | | | | | | | | | As the generate-time-related API is moving to cmGeneratorTarget, almost all of generation code needs to be able to access instances of it.
* | | | | Merge topic 'cmake-syntax-test-escaped-comment'Brad King2013-10-304-0/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8640e52 Add to RunCMake.Syntax test \-escape cases 144068e Add to RunCMake.Syntax test comments not separated by spaces
| * | | | | Add to RunCMake.Syntax test \-escape casesBrad King2013-10-293-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an Escape1 test case covering \-escape cases inside bracket, quoted, and unquoted arguments. Also cover comments immediately after quoted and unquoted arguments on lines containing \# escapes.
| * | | | | Add to RunCMake.Syntax test comments not separated by spacesBrad King2013-10-291-0/+5
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | Extend the BracketComment5 test case to cover both bracket comments and line comments starting immediately after a bracket comment closes.
* | | | | Merge topic 'doc-conf-auto-manuals'Brad King2013-10-3015-15/+51
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | f88332f Help: Glob manual/*.rst in Sphinx configuration
| * | | | | Help: Glob manual/*.rst in Sphinx configurationBrad King2013-10-3015-15/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the man page description line as explicit markup at the top of each Help/manual/*.rst file and scan it from conf.py to automatically generate the man_pages Sphinx configuration value. This reduces the number of places that need to be changed when a new manual is added.
* | | | | | Merge topic 'doc-build-standalone'Brad King2013-10-301-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 10ef247 Configure Utilities/Sphinx for standalone build with CTest
| * | | | | | Configure Utilities/Sphinx for standalone build with CTestBrad King2013-10-291-0/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Include the CTestUseLaunchers module in the standalone build of Utilities/Sphinx so that it can be built under CTest with the CTEST_USE_LAUNCHERS option.
* | | | | | Merge topic 'fix-coverage-over-multiple-projects'Brad King2013-10-301-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | eb1d6ce CTest: clean TargetDirs between unrelated coverage runs (issue 13143)
| * | | | | | CTest: clean TargetDirs between unrelated coverage runs (issue 13143)Nils Gladitz2013-10-291-0/+1
| | |_|_|_|/ | |/| | | |
* | | | | | CMake Nightly Date StampKitware Robot2013-10-301-1/+1
| |_|/ / / |/| | | |
* | | | | Merge topic 'doc-organize-index'Brad King2013-10-291-0/+2
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | c9d5ccf Help: Add index document title
| * | | | Help: Add index document titleBrad King2013-10-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Add an explicit title directive to set the HTML index page title instead of taking the first section header.
* | | | | Merge topic 'doc-organize-index'Brad King2013-10-291-10/+28
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | 2c7cd95 Help: Organize top-level index
| * | | | Help: Organize top-level indexBrad King2013-10-281-10/+28
| | |_|/ | |/| | | | | | | | | | | | | | Divide the list of manuals into separate sections each with its own title.
* | | | Merge topic 'fix-custom-source-with-flags-crash'Brad King2013-10-293-1/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | f037b9b Generators: don't append sources from utility targets to objectSources
| * | | | Generators: don't append sources from utility targets to objectSourcesNils Gladitz2013-10-283-1/+15
| | | | |
* | | | | Merge topic 'external-language-compiler-id'Brad King2013-10-291-1/+3
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | e65c788 CMakeDetermineCompilerId: Load src from CMAKE_MODULE_PATH (#14481)