summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* 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 '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-011-49/+56
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | 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-312-2/+43
|\ \ \ | | | | | | | | | | | | | | | | | | | | 4fcb97e Tests: Add test for CTEST_USE_LAUNCHERS capture of custom commands 05c7042 Ninja: run custom commands through launcher if available
| * | | Ninja: run custom commands through launcher if availableNils Gladitz2013-10-312-2/+43
| | | |
* | | | Merge topic 'vs-generator-names'Brad King2013-10-318-63/+169
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 29071fe VS: Add version year to generator names
| * | | | VS: Add version year to generator namesBrad King2013-10-288-63/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 '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 'fix-custom-source-with-flags-crash'Brad King2013-10-291-1/+8
|\ \ \ \ | |/ / / |/| | | | | | | | | | | f037b9b Generators: don't append sources from utility targets to objectSources
| * | | Generators: don't append sources from utility targets to objectSourcesNils Gladitz2013-10-281-1/+8
| | | |
* | | | CMake Nightly Date StampKitware Robot2013-10-291-1/+1
| | | |
* | | | Merge topic 'Qt-auto-generators'Brad King2013-10-2810-176/+937
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-244-1/+296
| | | | | | | | | | | | | | | | | | | | 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-247-14/+438
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-241-12/+26
| | | | | | | | | | | | | | | | They may not be skipped by autouic.
| * | | 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-241-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-241-3/+8
| | | |
| * | | 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
| | | |
| * | | Rename the cmake_automoc command to cmake_autogen.Stephen Kelly2013-10-242-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | There is no need for a "cmake_automoc" backward compatibility command because it is internal, undocumented, and only executed from a matching version of cmake.
| * | | Rename the cmQtAutoGenerator instances to reflect coming features.Stephen Kelly2013-10-242-9/+9
| | | |
| * | | Rename the cmQtAutomoc class to cmQtAutoGenerators.Stephen Kelly2013-10-246-38/+42
| | | | | | | | | | | | | | | | It will be extended to process .ui and .qrc files too.
* | | | Merge topic 'enable-language-require-compiler'Brad King2013-10-284-25/+99
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3e04946 Require CMAKE_<LANG>_COMPILER to be found as a full path 6007f7c CMakeDetermineCompilerId: Always use compiler detected from IDE 332771c CMakeDetermine*Compiler: Remove temporary cache entry
| * | | | Require CMAKE_<LANG>_COMPILER to be found as a full pathBrad King2013-10-284-25/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All generators now support detection of the full path to the compiler, so require it to be so. This will allow CMake<LANG>Information.cmake and other logic to assume the full path to the compiler tool is available. The Makefile generators already rejected CMAKE_<LANG>_COMPILER values that did not name an existing compiler. Extend this error message to all generators, make it occur as early as possible, and improve the message with advice about how to set the compiler. If the full path to the compiler is not known, finish enabling languages with a fatal error so configuration does not continue. For now, allow the RC language compiler to not be a full path. Later we will need to detect the full path to "rc" under the VS IDE. Add a RunCMake.CompilerNotFound test to cover failure cases. Fix the RunCMake.CompilerChange test EmptyCompiler case to work when configuration does not continue past enable_language.
* | | | | Merge topic 'restore-serial-failed-test-order'Brad King2013-10-281-3/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 2b5c9da CTest: restore old failed test priority in serial test runs
| * | | | | CTest: restore old failed test priority in serial test runsNils Gladitz2013-10-271-3/+4
| | |_|_|/ | |/| | |
* | | | | Merge topic 'ninja-use-deps'Brad King2013-10-286-71/+150
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | eeb4aec Ninja: use deps = gcc/msvc feature