summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* silence selected clang-tidy violationsDaniel Pfeifer2016-10-182-4/+5
|
* Merge topic 'timeout_after_match_testtime'Brad King2016-10-181-0/+1
|\ | | | | | | | | 909842ff CTest: report time spent after matching output
| * CTest: report time spent after matching outputZack Galbreath2016-10-171-0/+1
| | | | | | | | | | When using the TIMEOUT_AFTER_MATCH test property, only report the time spent by the test after the matching output was found.
* | Merge topic 'propagate_ctest_use_launchers'Brad King2016-10-181-0/+4
|\ \ | | | | | | | | | | | | 19beee46 ctest_configure: Propagate CTEST_USE_LAUNCHERS from caller to project
| * | ctest_configure: Propagate CTEST_USE_LAUNCHERS from caller to projectBill Hoffman2016-10-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | If `CTEST_USE_LAUNCHERS` is `TRUE` in a CTest script then the `ctest_configure` command will add `-DCTEST_USE_LAUNCHERS:BOOL=TRUE` to the cmake command used to configure the project. This allows a project to only set `CTEST_USE_LAUNCHERS` in a ctest script and have launchers work.
* | | Merge topic 'math-EXPR-unary'Brad King2016-10-183-862/+1157
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 2810e561 math(EXPR): Add support for unary `+` and `-` expressions 834f52a6 cmExprParser: Revise indentation style to match rest of CMake 7aaed265 cmExprParser: Port to bison 3
| * | | math(EXPR): Add support for unary `+` and `-` expressionsBrad King2016-10-142-57/+94
| | | | | | | | | | | | | | | | Closes: #8996
| * | | cmExprParser: Revise indentation style to match rest of CMakeBrad King2016-10-142-115/+155
| | | |
| * | | cmExprParser: Port to bison 3Brad King2016-10-143-792/+1010
| | | | | | | | | | | | | | | | | | | | Use %-directives to specify the scanner/lexer arguments and update the yyerror signature. Reduce the list of post-bison modifications needed.
* | | | CMake Nightly Date StampKitware Robot2016-10-181-1/+1
| |_|/ |/| |
* | | Merge topic 'extract-computed-target-properties'Brad King2016-10-1710-290/+489
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cef59bb8 cmTarget: Implement GetProperty in terms of cmState::Snapshot 0d57b07a cmTarget: Group code for checking written properties together c3fb0d95 cmTarget: Move sanity checks and computed property access to callers fa9dbc56 cmGeneratorTarget: Implement cmTargetPropertyComputer interface 848ae2a6 cmTargetPropertyComputer: Template some methods on the Target a0a720e6 cm{,Generator}Target: Add global generator accessors 637e3f3e cmTargetPropertyComputer: Unify whitelist handling from cmTarget 05251e6d cmTargetPropertyComputer: Move whitelist check from cmTarget fbf1721c cmTargetPropertyComputer: Extract into new files 390a7d86 cmTargetPropertyComputer: Implement GetProperty without cmMakefile e32a6bdd cmListFileBacktrace: Add a method to retrieve the Bottom of a snapshot 7863fba1 cmTarget: Extract GetLocation method 8096682e cmTarget: Extract GetSources method 7d57c1a2 cmTarget: Extract location computation methods a55cac4b cmTarget: Split property computation into separate class 705fcf52 cmTarget: Move IMPORTED check to callers ...
| * | | cmTarget: Implement GetProperty in terms of cmState::SnapshotStephen Kelly2016-10-161-3/+10
| | | |
| * | | cmTarget: Group code for checking written properties togetherStephen Kelly2016-10-161-25/+25
| | | |
| * | | cmTarget: Move sanity checks and computed property access to callersStephen Kelly2016-10-165-22/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The GetProperty method is now just accessing contained data, meaning it can be implemented in cmState. Remove the cmMakefile context from the signature as a result and remove the overload with the same signature. Add a GetComputedProperty to cmTarget so that templates can be properly instantiated. Otherwise the Commands would need to be able to reach the specializations which are currently in cmTarget.cxx. As a side-effect, the CMP0026 warning now gives a backtrace to the target when issued from a generator expression.
| * | | cmGeneratorTarget: Implement cmTargetPropertyComputer interfaceStephen Kelly2016-10-152-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Populate a local member for the sources property when the instance is created. Pass the parameter to avoid the policy check when doing so. Ordinarily, the GetSources function should not be called unconditionally (at generate time), but we need to do so here in case the property is read in a generator expression. The intent is to be able to implement cmGeneratorTarget without requiring cmTarget.
| * | | cmTargetPropertyComputer: Template some methods on the TargetStephen Kelly2016-10-153-199/+200
| | | | | | | | | | | | | | | | Implement the methods for cmTarget in the cmTarget source.
| * | | cm{,Generator}Target: Add global generator accessorsStephen Kelly2016-10-154-0/+15
| | | | | | | | | | | | | | | | | | | | Provide 'static polymorphism' between the types in this aspect so that they can be used indiscriminately in a C++ template.
| * | | cmTargetPropertyComputer: Unify whitelist handling from cmTargetStephen Kelly2016-10-153-21/+29
| | | |
| * | | cmTargetPropertyComputer: Move whitelist check from cmTargetStephen Kelly2016-10-153-35/+37
| | | |
| * | | cmTargetPropertyComputer: Extract into new filesStephen Kelly2016-10-154-245/+289
| | | |
| * | | cmTargetPropertyComputer: Implement GetProperty without cmMakefileStephen Kelly2016-10-151-24/+32
| | | | | | | | | | | | | | | | Only a cmMessenger and a backtrace are needed.
| * | | cmListFileBacktrace: Add a method to retrieve the Bottom of a snapshotStephen Kelly2016-10-151-0/+2
| | | |
| * | | cmTarget: Extract GetLocation methodStephen Kelly2016-10-151-38/+54
| | | |
| * | | cmTarget: Extract GetSources methodStephen Kelly2016-10-151-83/+92
| | | |
| * | | cmTarget: Extract location computation methodsStephen Kelly2016-10-151-54/+44
| | | |
| * | | cmTarget: Split property computation into separate classStephen Kelly2016-10-152-54/+78
| | | | | | | | | | | | | | | | | | | | Everything related to property computation will be moved here and eventually shared with cmGeneratorTarget.
| * | | cmTarget: Move IMPORTED check to callersStephen Kelly2016-10-151-6/+7
| | | | | | | | | | | | | | | | This way the policy can be checked without depending on cmTarget.
| * | | cmTarget: Move SOURCES property computation before the restStephen Kelly2016-10-151-85/+85
| | | | | | | | | | | | | | | | The SOURCES have to be computed.
| * | | cmTarget: Remove mutable marker from propertiesStephen Kelly2016-10-152-3/+3
| | | |
| * | | cmTarget: Use static storage for computed propertiesStephen Kelly2016-10-151-12/+21
| |/ / | | | | | | | | | Avoid having to populate a mutable container to return a value.
* | | Merge topic 'extract-cmRulePlaceholderExpander'Brad King2016-10-1713-439/+633
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b59b6dd9 cmRulePlaceholderExpander: Port clients to direct-use bdddd423 cmRulePlaceholderExpander: Extract from cmLocalGenerator f796e1b6 cmLocalGenerator: Move memset to cxx file c75a9d66 cmLocalGenerator: Use strings instead of a Target in rule replacement 46ad0d21 cmLocalGenerator: Use a converter in rule replacement API 2628dec1 cmLocalGenerator: Store variable replacements as state 315b9a31 cmLocalGenerator: Merge loops which populate mapping d5feb5b3 cmLocalGenerator: Populate variable mapping for all replacements efba22e1 cmLocalGenerator: Extract compiler option replacement from loop b29425f7 cmLocalGenerator: Populate a container of mappings for replacements f009d8f5 cmLocalGenerator: Move compiler option handling to be more direct 6cd27a85 cmLocalGenerator: Move variable to where it can be used easily 8b0e4795 cmLocalGenerator: Use the language from the compiler container 88016e2e cmLocalGenerator: Introduce a container of compiler names be87cb0c cmLocalGenerator: Simplify loop with range algorithm 425cd167 cmLocalGenerator: Remove the launcher from RuleVariables
| * | | cmRulePlaceholderExpander: Port clients to direct-useStephen Kelly2016-10-1510-66/+91
| | | | | | | | | | | | | | | | | | | | | | | | Add a factory function to cmLocalGenerator so that variableMappings can be provided from it, and so that Ninja can always have a hard-coded TargetImpLib.
| * | | cmRulePlaceholderExpander: Extract from cmLocalGeneratorStephen Kelly2016-10-155-321/+397
| | | | | | | | | | | | | | | | | | | | Implement cmLocalGenerator::ExpandRuleVariables in terms of the new class for source compatibility and to reduce diff noise in this commit.
| * | | cmLocalGenerator: Move memset to cxx fileStephen Kelly2016-10-152-1/+6
| | | |
| * | | cmLocalGenerator: Use strings instead of a Target in rule replacementStephen Kelly2016-10-158-12/+28
| | | | | | | | | | | | | | | | Don't rely on the cmGeneratorTarget type needlessly.
| * | | cmLocalGenerator: Use a converter in rule replacement APIStephen Kelly2016-10-159-24/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The rule replacement API should not really be in cmLocalGenerator, but it was historically, and this coupled many other things together here too, such as output conversion. Make the output converter a parameter so that rule replacement can be removed from cmLocalGenerator.
| * | | cmLocalGenerator: Store variable replacements as stateStephen Kelly2016-10-152-94/+95
| | | | | | | | | | | | | | | | These do not change over the lifetime of the cmLocalGenerator.
| * | | cmLocalGenerator: Merge loops which populate mappingStephen Kelly2016-10-151-14/+12
| | | |
| * | | cmLocalGenerator: Populate variable mapping for all replacementsStephen Kelly2016-10-151-10/+11
| | | | | | | | | | | | | | | | | | | | This reduces the final replacement to a simple query in the map, which is much more readable than what was here before.
| * | | cmLocalGenerator: Extract compiler option replacement from loopStephen Kelly2016-10-151-50/+48
| | | | | | | | | | | | | | | | | | | | There is no need to be in the loop. Being there just adds to complexity.
| * | | cmLocalGenerator: Populate a container of mappings for replacementsStephen Kelly2016-10-151-31/+58
| | | | | | | | | | | | | | | | | | | | | | | | The same variables are replaced/retrieved from cmMakefile again and again. Use a container so that they don't have to be retrieved repeatedly, and to simplify the nested loop.
| * | | cmLocalGenerator: Move compiler option handling to be more directStephen Kelly2016-10-151-23/+25
| | | |
| * | | cmLocalGenerator: Move variable to where it can be used easilyStephen Kelly2016-10-151-1/+2
| | | |
| * | | cmLocalGenerator: Use the language from the compiler containerStephen Kelly2016-10-151-7/+8
| | | | | | | | | | | | | | | | This is just to make follow-up diffs smaller.
| * | | cmLocalGenerator: Introduce a container of compiler namesStephen Kelly2016-10-151-3/+17
| | | | | | | | | | | | | | | | Use it to determine when a rule replacement should gain extra options.
| * | | cmLocalGenerator: Simplify loop with range algorithmStephen Kelly2016-10-151-6/+4
| | | |
| * | | cmLocalGenerator: Remove the launcher from RuleVariablesStephen Kelly2016-10-159-44/+57
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | This one is not like the others as it doesn't participate in substitutions. Keep ExpandRuleVariables doing only one thing and make callers responsible for inserting a launcher prefix, simplifying the code all-around. Remove now-obsolete InsertRuleLauncher method.
* | | Merge topic 'refactor-folder-name-retrieval'Brad King2016-10-178-14/+28
|\ \ \ | | | | | | | | | | | | | | | | 3b6f1587 Factor IDE folder name retrieval out into helper method
| * | | Factor IDE folder name retrieval out into helper methodGregor Jasny2016-10-178-14/+28
| | | | | | | | | | | | | | | | | | | | | | | | Add a `cmGeneratorTarget::GetEffectiveFolderName` helper to abstract lookup of the `FOLDER` property in combination with checking for generator support of folders.
* | | | Merge topic 'cmcldeps-more-safety'Brad King2016-10-171-8/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 70e268da cmcldeps: prefer the /TC flag 47092d3e cmcldeps: append strings as strings 7db671a1 cmcldeps: search for single-byte strings as characters