summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmMakefile: Return target from all AddUtilityCommand signaturesBrad King2015-07-292-19/+21
|
* Merge topic 'use-generator-target'Brad King2015-07-2842-560/+478
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 57f03e59 Port some of the cmExportFileGenerator API to cmGeneratorTarget. 57ab0f70 Port cmExportBuildFileGenerator to cmGeneratorTarget. 570938cb cmExportTryCompileFileGenerator: Create cmGeneratorTargets. ec38e4c8 Move GetFullPath to cmGeneratorTarget dfb025bf Move GetLocationForBuild to cmGeneratorTarget. 9f2dca80 Move GetLocation to cmGeneratorTarget. c7a8e74b Always access target location from a cmGeneratorTarget instance. 5b60eaf6 cmTarget: Restore the ImportedGetLocation method. 50b17a61 cmIncludeCommand: Populate the cmGeneratorTargets in deprecated path. ba266858 cmTarget: Create cmGeneratorTargets before reading deprecated LOCATION. 5ab3a946 cmTarget: Inline GetLocation into deprecated callers. 496f4cd0 cmGlobalGenerator: Create cmGeneratorTargets before QtAutomoc. de80993a cmGlobalGenerator: Create cmGeneratorTargets earlier. 611220f7 cmTarget: Use reliable test for CMP0024 and CMP0026 OLD. bbad6ba5 cmLocalGenerator: Remove unused AddCustomCommandToCreateObject method. e4dc83ad cmLocalGenerator: Remove unused AddBuildTargetRule method. ...
| * Port some of the cmExportFileGenerator API to cmGeneratorTarget.Stephen Kelly2015-07-274-23/+32
| | | | | | | | | | Enough to make it more possible to move GetLinkInterface to cmGeneratorTarget.
| * Port cmExportBuildFileGenerator to cmGeneratorTarget.Stephen Kelly2015-07-272-24/+26
| |
| * cmExportTryCompileFileGenerator: Create cmGeneratorTargets.Stephen Kelly2015-07-276-17/+36
| | | | | | | | | | This is not a deprecated behavior, but only requires IMPORTED targets be made.
| * Move GetFullPath to cmGeneratorTargetStephen Kelly2015-07-2712-128/+143
| |
| * Move GetLocationForBuild to cmGeneratorTarget.Stephen Kelly2015-07-274-41/+46
| |
| * Move GetLocation to cmGeneratorTarget.Stephen Kelly2015-07-278-25/+31
| |
| * Always access target location from a cmGeneratorTarget instance.Stephen Kelly2015-07-274-11/+15
| |
| * cmTarget: Restore the ImportedGetLocation method.Stephen Kelly2015-07-273-6/+20
| | | | | | | | | | | | It was removed in commit f154475b (cmTarget: Refactor GetLocation API, 2014-03-08), but it is more readable for targets we know are imported.
| * cmIncludeCommand: Populate the cmGeneratorTargets in deprecated path.Stephen Kelly2015-07-271-0/+1
| |
| * cmTarget: Create cmGeneratorTargets before reading deprecated LOCATION.Stephen Kelly2015-07-271-2/+8
| | | | | | | | | | | | | | | | | | | | The intention is to move generation-semantic cmTarget API to cmGeneratorTarget and then use the latter for generator expressions. This means that each time we read a deprecated LOCATION property, we have to clear and re-populate the container. That must be done each time because the result can change through the configure process, which is why this is deprecated in the first place.
| * cmTarget: Inline GetLocation into deprecated callers.Stephen Kelly2015-07-271-7/+36
| |
| * cmGlobalGenerator: Create cmGeneratorTargets before QtAutomoc.Stephen Kelly2015-07-275-4/+21
| | | | | | | | Add cmGeneratorTargets as needed in the QtAutomoc processing.
| * cmGlobalGenerator: Create cmGeneratorTargets earlier.Stephen Kelly2015-07-271-1/+1
| |
| * cmTarget: Use reliable test for CMP0024 and CMP0026 OLD.Stephen Kelly2015-07-271-2/+2
| | | | | | | | | | Check whether the Makefile is fully configured instead of checking whether generator targets exist.
| * cmLocalGenerator: Remove unused AddCustomCommandToCreateObject method.Stephen Kelly2015-07-272-84/+0
| |
| * cmLocalGenerator: Remove unused AddBuildTargetRule method.Stephen Kelly2015-07-272-105/+0
| |
| * cmLocalGenerator: Remove CreateCustomTargetsAndCommands method.Stephen Kelly2015-07-275-66/+0
| | | | | | | | | | It loops over cmGeneratorTargets, but at the point it is called, there are no cmGeneratorTargets. This must be dead code.
| * cmGlobalGenerator: Add global targets at the end of Configure.Stephen Kelly2015-07-271-12/+27
| | | | | | | | Rather than at the start of Generate.
| * cmGlobalGenerator: Extract method to create generator objects.Stephen Kelly2015-07-272-2/+10
| |
| * cmGlobalGenerator: Split creation of generator object from initialization.Stephen Kelly2015-07-272-1/+15
| |
| * cmCPackPropertiesGenerator: Require cmLocalGenerator in API.Stephen Kelly2015-07-273-8/+13
| |
| * cmCustomCommandGenerator: Require cmLocalGenerator in API.Stephen Kelly2015-07-2713-32/+36
| |
* | Merge topic 'cmConditionEvaluator-minor-cleanup'Brad King2015-07-281-8/+8
|\ \ | | | | | | | | | | | | e7d5c142 cmConditionEvaluator: Remove superfluous spaces in expressions
| * | cmConditionEvaluator: Remove superfluous spaces in expressionsSebastian Schuberth2015-07-271-8/+8
| | |
* | | Merge topic 'ctest-add_subdirectory-crash'Brad King2015-07-281-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 64821e8a ctest: fix add_subdirectory() crash
| * | | ctest: fix add_subdirectory() crashBen Boeckel2015-07-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The directory is at args[0], not args[1]. Introduced in commit v2.6.0~489 (... 5889 ... tests are not found in some cases when using add_subdirectory ..., 2008-01-18).
* | | | Merge topic 'cmake-install-dependencies-option'Brad King2015-07-283-3/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 068e7962 CMake: Add CMake_INSTALL_DEPENDENCIES option
| * | | | CMake: Add CMake_INSTALL_DEPENDENCIES optionKonstantin Podsvirov2015-07-273-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | By default this option is ON. Turn OFF to disable installing runtime 3rd-party dependencies.
* | | | | Merge topic 'cmake-gui-install-plugin'Brad King2015-07-281-10/+24
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | 42f0155b cmake-gui: Install Qt5 Windows platform plugin
| * | | | cmake-gui: Install Qt5 Windows platform pluginKonstantin Podsvirov2015-07-271-10/+24
| | | | | | | | | | | | | | | | | | | | | | | | | Qt5 requires a platform-specific runtime-loaded plugin. We already install it for OS X. Install it for Windows too.
* | | | | Merge topic 'refactor-ninja-command-exporter'Brad King2015-07-282-65/+98
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | cd530df8 cmNinjaTargetGenerator: Factor out compile command exporter
| * | | | | cmNinjaTargetGenerator: Factor out compile command exporterBrad King2015-07-272-65/+98
| | |_|/ / | |/| | |
* | | | | Merge topic 'fortran-parser-updates'Brad King2015-07-2812-1634/+1461
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ecca8fd9 cmFortranParser: Port to bison 3 eebe732b cmFortranParser: Factor out of cmDependsFortran fd194458 cmDependsFortran: Simplify storage of preprocessor definitions 295480b9 cmDependsFortran: Move FindIncludeFile method into parser class 98b9645b Rename Fortran parser infrastructure to drop "Depends" prefix 096dd3c9 cmDependsFortranLexer: Remove trailing blank line
| * | | | | cmFortranParser: Port to bison 3Brad King2015-07-273-633/+444
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use %-directives to specify the scanner/lexer arguments and update the yyerror signature. Reduce the list of post-bison modifications needed.
| * | | | | cmFortranParser: Factor out of cmDependsFortranBrad King2015-07-274-465/+488
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the main parser class and method implementations out of cmDependsFortran.cxx and into separate source files.
| * | | | | cmDependsFortran: Simplify storage of preprocessor definitionsBrad King2015-07-272-13/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Collect the original preprocessor definitions in a std::set<> so that it can be copied directly by cmFortranParser's constructor instead of making a copy on the stack.
| * | | | | cmDependsFortran: Move FindIncludeFile method into parser classBrad King2015-07-272-20/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This drops the only awareness of cmDependsFortran that cmFortranParser needed.
| * | | | | Rename Fortran parser infrastructure to drop "Depends" prefixKitware Robot2015-07-2711-632/+633
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The parser can be re-used outside cmDependsFortran or the cmDepends class hierarchy so drop the "Depends" from its name: rename 's/DependsFortran([A-Za-z0-9_])/Fortran$1/' Source/*.* sed -i 's/DependsFortran\([A-Za-z0-9_]\)/Fortran\1/g' Source/*.* sed -i 's/FortranInternals/DependsFortranInternals/g' Source/*.* Also manually fix Source/CMakeLists.txt source file ordering.
| * | | | | cmDependsFortranLexer: Remove trailing blank lineBrad King2015-07-271-1/+0
| |/ / / /
* | | | | Merge topic 'emacs-mode-updates'Brad King2015-07-281-103/+90
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5593f28f cmake-mode.el: Derive cmake-mode from prog-mode 41d6044b cmake-mode.el: Add font-lock for keywords and variables 7987d985 cmake-mode.el: Rename function to be consistent 63de609e cmake-mode.el: Use `rx' for regexps 9d5082b2 cmake-mode.el: Minor clean-up
| * | | | | cmake-mode.el: Derive cmake-mode from prog-modeRoy Crihfield2015-07-271-35/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Emacs 24 and above support a generic "prog-mode" to simplify definition of programming modes. Derive "cmake-mode" from it since we are a programming mode.
| * | | | | cmake-mode.el: Add font-lock for keywords and variablesRoy Crihfield2015-07-271-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Control flow keywords will now be highlighted as such. Variable names will be also be recognized. Adjust function name highlighting to work in places other than the start of a line.
| * | | | | cmake-mode.el: Rename function to be consistentRoy Crihfield2015-07-271-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unscreamify-cmake-buffer => cmake-unscreamify-buffer While at it, wrap the operation in (save-excursion).
| * | | | | cmake-mode.el: Use `rx' for regexpsRoy Crihfield2015-07-271-16/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows the keywords be defined in a list and reused in different regexps.
| * | | | | cmake-mode.el: Minor clean-upRoy Crihfield2015-07-271-41/+20
| |/ / / / | | | | | | | | | | | | | | | Superficial changes to use more conventional Emacs Lisp idioms.
* | | | | CMake Nightly Date StampKitware Robot2015-07-281-1/+1
|/ / / /
* | | | Merge topic 'trace-expand'Brad King2015-07-2710-7/+46
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 594bafe5 cmake: add --trace-expand option
| * | | | cmake: add --trace-expand optionBen Boeckel2015-07-2310-7/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The --trace option is helpful, but sometimes, what you're looking for is deep under many layers of function calls and figuring out what instance of the function call you're looking at is tedious to determine (usually involving patching and message()). Instead, add a --trace-expand option to trace while expanding commands into what CMake actually sees.