summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* ctest_update: Do not remove the p4 depot namePedro Navarro2013-11-013-11/+11
| | | | | | Instead of removing the depot name, which causes problems when looking at the file change list in CDash, make the Update test remove a given prefix from the files retrieved from Update.xml.
* 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)
| * | | | CMakeDetermineCompilerId: Load src from CMAKE_MODULE_PATH (#14481)Dragos Carp2013-10-281-1/+3
| | |/ / | |/| | | | | | | | | | Support new languages using CMAKE_MODULE_PATH.
* | | | CMake Nightly Date StampKitware Robot2013-10-291-1/+1
| | | |
* | | | Merge topic 'Qt-auto-generators'Brad King2013-10-2866-205/+1228
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9c87d9c Add automatic rcc invocation for Qt. 84218e1 Add automatic uic invocation for Qt. 94a0ca6 Record which files are skipped by automoc. 18fb758 Run the main executable created in the autogen tests. e485ba1 Rename the QtAutomoc tests to QtAutogen. 7ce65c3 Add extra checks for the AUTOMOC target property. 32771fc Update output messages for generic use. f371ab5 Rename RunAutomoc to RunAutogen. 85b3d6e Extract an SetupAutoMocTarget method. ca124a1 Rename the AutomocInfo.cmake file to be more generic. a342c9f Move some makefile definitions up away from moc-specific code. 98632ef Add the AUTOGEN_TARGETS_FOLDER and obsolete AUTOMOC_TARGETS_FOLDER. 63378ba Rename some variables to reflect broader scope. 97f1aa3 Rename method to reflect generic use. 4abb111 Rename local variable to reflect generic use. 03878c9 Move variable set to where it is used. ...
| * | | Add automatic rcc invocation for Qt.Stephen Kelly2013-10-2417-10/+426
| | | | | | | | | | | | | | | | | | | | This replaces the need to invoke qt4_add_resources by allowing adding the source .qrc file directly to the target sources.
| * | | Add automatic uic invocation for Qt.Stephen Kelly2013-10-2419-14/+559
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The source files are already processed by cmQtAutomoc to look for moc includes, so extend that to also look for ui_ includes and find corresponding .ui files to process. This replaces the need to invoke qt4_wrap_ui(). As the ui files are not likely to be part of the SOURCES of the target, store the options associated with them separately in the cmMakefile for querying during the autogen run.
| * | | Record which files are skipped by automoc.Stephen Kelly2013-10-242-12/+27
| | | | | | | | | | | | | | | | They may not be skipped by autouic.
| * | | Run the main executable created in the autogen tests.Stephen Kelly2013-10-243-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't try to show the windows, which would require a gui capable test machine, and that's not guaranteed. Automatically link to qtmain.a on Windows to avoid a policy warning. Set policy CMP0020 to NEW by increasing the required version. Don't attempt to run the test when using Windows.
| * | | Rename the QtAutomoc tests to QtAutogen.Stephen Kelly2013-10-2437-13/+13
| | | |
| * | | Add extra checks for the AUTOMOC target property.Stephen Kelly2013-10-241-14/+21
| | | | | | | | | | | | | | | | In an upcoming commit, this class will be used even if it is not set.
| * | | Update output messages for generic use.Stephen Kelly2013-10-241-14/+14
| | | |
| * | | Rename RunAutomoc to RunAutogen.Stephen Kelly2013-10-242-3/+3
| | | | | | | | | | | | | | | | It will soon be used to process ui and rcc files too.
| * | | Extract an SetupAutoMocTarget method.Stephen Kelly2013-10-242-48/+61
| | | | | | | | | | | | | | | | This class will soon gain methods for autouic and autorcc.
| * | | Rename the AutomocInfo.cmake file to be more generic.Stephen Kelly2013-10-242-3/+3
| | | |
| * | | Move some makefile definitions up away from moc-specific code.Stephen Kelly2013-10-241-22/+21
| | | |
| * | | Add the AUTOGEN_TARGETS_FOLDER and obsolete AUTOMOC_TARGETS_FOLDER.Stephen Kelly2013-10-244-3/+19
| | | |
| * | | Rename some variables to reflect broader scope.Stephen Kelly2013-10-241-8/+9
| | | |
| * | | Rename method to reflect generic use.Stephen Kelly2013-10-242-3/+3
| | | |
| * | | Rename local variable to reflect generic use.Stephen Kelly2013-10-241-8/+8
| | | |
| * | | Move variable set to where it is used.Stephen Kelly2013-10-241-2/+1
| | | |