summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Makefile: Restore RULE_LAUNCH_COMPILE generation on compilation rulesBrad King2016-12-091-1/+11
| | | | | | | | Refactoring in commit 425cd167 (cmLocalGenerator: Remove the launcher from RuleVariables, 2016-10-09) accidentally broke Makefile generator handling of `RULE_LAUNCH_COMPILE`. Responsibility moved from `ExpandRuleVariables` to its call sites, and the Makefile generator call site for compilations was not properly updated. Fix it now.
* Merge topic 'extract-cmRulePlaceholderExpander'Brad King2016-10-1714-439/+634
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-156-321/+398
| | | | | | | | | | 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
| * | | cmcldeps: prefer the /TC flagBen Boeckel2016-10-141-6/+1
| | | | | | | | | | | | | | | | | | | | The /TC flag causes all source files to be processed as C source files. We know that there is only one, so this is safe.
| * | | cmcldeps: append strings as stringsBen Boeckel2016-10-141-1/+1
| | | |
| * | | cmcldeps: search for single-byte strings as charactersBen Boeckel2016-10-141-2/+2
| | | |
* | | | Merge topic 'osx-no-deployment-target-on-cross-compile'Brad King2016-10-171-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | e8bafb6f OS X: Do not try to set deployment target when cross-compiling
| * | | | OS X: Do not try to set deployment target when cross-compilingGregor Jasny2016-10-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit v3.4.0-rc2~6^2 (Xcode: Adjust deployment target SDK version to host version, 2015-10-11) does not make sense when cross-compiling. Make it conditional to fix this regression in some cross-compiling cases. Closes: #16355
* | | | | Merge topic 'doc-math-EXPR'Brad King2016-10-171-4/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | c05d9b05 Help: Fix math(EXPR) documentation formatting
| * | | | | Help: Fix math(EXPR) documentation formattingBrad King2016-10-141-4/+5
| |/ / / /
* | | | | Merge topic 'doc-clarify-ctest-APPEND'Brad King2016-10-174-4/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 78b00f1d Help: Clarify `ctest_*` APPEND option behavior
| * | | | | Help: Clarify `ctest_*` APPEND option behaviorBrad King2016-10-144-4/+12
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly state that this marks the `.xml` to tell the dashboard server to append it to previously submitted results and that it does not cause results to be appended to the `.xml` file.
* | | | | CMake Nightly Date StampKitware Robot2016-10-171-1/+1
| |_|/ / |/| | |
* | | | CMake Nightly Date StampKitware Robot2016-10-161-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2016-10-151-1/+1
| |_|/ |/| |
* | | Merge branch 'release'Brad King2016-10-140-0/+0
|\ \ \ | |_|/ |/| |
| * | Merge branch 'ninja-framework-POST_BUILD' into releaseBrad King2016-10-132-2/+9
| |\ \
| * \ \ Merge branch 'backport-LINK_WHAT_YOU_USE-allow-OFF' into releaseBrad King2016-10-133-6/+6
| |\ \ \
| * \ \ \ Merge branch 'ninja-rc-regression' into releaseBrad King2016-10-131-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'ice-3.6.3' into releaseBrad King2016-10-131-0/+1
| |\ \ \ \ \
* | \ \ \ \ \ Merge topic 'vs-host-x64-tools'Brad King2016-10-1429-7/+209
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d079e71c VS: Provide an option to use x64 host tools 779939a0 Help: Document VS and Xcode toolset selection
| * | | | | | | VS: Provide an option to use x64 host toolsBrad King2016-10-1425-1/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Visual Studio provides toolchains that are themselves built for 32-bit or 64-bit host architectures. By default it uses the 32-bit tools, but it can be told to prefer the 64-bit tools on 64-bit hosts. Extend the `CMAKE_GENERATOR_TOOLSET` specification to provide a way to request use of the 64-bit host tools. Closes: #15622
| * | | | | | | Help: Document VS and Xcode toolset selectionBrad King2016-10-137-6/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add explicit sections to the individual generator documentation to cover the `cmake -T` option along with the default behavior for each generator.
* | | | | | | | Merge topic 'flush-archive-list'Brad King2016-10-141-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 39b08858 cmSystemTools: Flush output buffer for list_item_verbose
| * | | | | | | | cmSystemTools: Flush output buffer for list_item_verboseDāvis Mosāns2016-10-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `std::cout` and `FILE *stdout` are used at same time need to explicitly flush otherwise they can be out of sync.
* | | | | | | | | Merge topic 'FindBoost-minor-cleanup'Brad King2016-10-141-13/+11
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 08b9a0fd FindBoost: Simplify library dir detection with cascading if/elseif/else ca4029fa FindBoost: Minor style updates 2e242b5c FindBoost: Use list(INSERT) to simplify suffix list generation 6699d46a FindBoost: Use string(APPEND) in more cases
| * | | | | | | | | FindBoost: Simplify library dir detection with cascading if/elseif/elseAlex Turbov2016-10-131-6/+4
| | | | | | | | | |
| * | | | | | | | | FindBoost: Minor style updatesAlex Turbov2016-10-131-2/+2
| | | | | | | | | |
| * | | | | | | | | FindBoost: Use list(INSERT) to simplify suffix list generationAlex Turbov2016-10-131-1/+1
| | | | | | | | | |
| * | | | | | | | | FindBoost: Use string(APPEND) in more casesAlex Turbov2016-10-131-4/+4
| | | | | | | | | |
* | | | | | | | | | Merge topic 'st2-exclude-patterns-variable'Brad King2016-10-145-2/+26
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 19ffc072 Sublime: Exclude build tree from source tree project only optionally
| * | | | | | | | | | Sublime: Exclude build tree from source tree project only optionallyBruno Pedrosa2016-10-125-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a `CMAKE_SUBLIME_TEXT_2_EXCLUDE_BUILD_TREE` variable to control addition of the build tree to `folder_exclude_patterns` in the `.sublime-project`. Change the default of this behavior to OFF. Closes: #16351
generated by cgit v0.12 at 2025-01-13 08:54:30 (GMT)