summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 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
* | | | | | | | | | Merge topic 'ninja-framework-POST_BUILD'Brad King2016-10-142-2/+9
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 20278872 Ninja: Fix POST_BUILD commands on macOS Frameworks
| * | | | | | | | | Ninja: Fix POST_BUILD commands on macOS FrameworksBrad King2016-10-132-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The condition added by commit v2.8.12~179^2 (OS X: Fix regression handling frameworks for Ninja, 2013-07-16) for excluding use of versioning symlinks on macOS Frameworks must match that used for POST_BUILD selection. Otherwise we place the POST_BUILD commands after a symlink step that is never added. Closes: #16363
* | | | | | | | | | Merge topic 'ninja-rc-regression'Brad King2016-10-141-1/+1
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 9977899d Ninja: Fix RC language depfile generation with cmcldeps
| * | | | | | | | | Ninja: Fix RC language depfile generation with cmcldepsBen Boeckel2016-10-131-1/+1
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.7.0-rc1~275^2 (Ninja: Use full path for all source files, 2016-08-05), the source path was changed to use an absolute path. Inside of `cmcldeps` for `.rc` file compilation, it uses a separate argument for the path to the source file. This ended up causing `cmcldeps` to transform the following call: cmcldeps.exe RC source.rc ... C:/full/path/to/source.rc into: ... C:/full/path/to//Tc source.rc which is invalid. Update the source filename to use the full path to the source file so that the path is replaced properly.
* | | | | | | | | Merge topic 'LINK_WHAT_YOU_USE-allow-OFF'Brad King2016-10-143-6/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2f79b22c Merge branch 'backport-LINK_WHAT_YOU_USE-allow-OFF' into LINK_WHAT_YOU_USE-allow-OFF 33cb0173 Honor LINK_WHAT_YOU_USE when set to OFF 933e54d3 Honor LINK_WHAT_YOU_USE when set to OFF
| * \ \ \ \ \ \ \ \ Merge branch 'backport-LINK_WHAT_YOU_USE-allow-OFF' into ↵Brad King2016-10-130-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | LINK_WHAT_YOU_USE-allow-OFF
| | * | | | | | | | Honor LINK_WHAT_YOU_USE when set to OFFJamie Snape2016-10-133-6/+6
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly setting variable CMAKE_LINK_WHAT_YOU_USE or property LINK_WHAT_YOU_USE to OFF should not cause LWYU to run. Fix the property lookup to use GetPropertyAsBool.
| * | | | | | | | Honor LINK_WHAT_YOU_USE when set to OFFJamie Snape2016-10-133-6/+6
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly setting variable CMAKE_LINK_WHAT_YOU_USE or property LINK_WHAT_YOU_USE to OFF should not cause LWYU to run. Fix the property lookup to use GetPropertyAsBool.
* | | | | | | | CMake Nightly Date StampKitware Robot2016-10-141-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'release'Brad King2016-10-130-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Merge branch 'cmake-gui-fix-extra-generator-names' into releaseBrad King2016-10-111-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'ExternalProject-fix-CMAKE_CACHE_ARGS-list' into releaseBrad King2016-10-105-3/+25
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'vs15-separate-flag-table' into releaseBrad King2016-10-103-3/+247
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge topic 'ice-3.6.3'Brad King2016-10-131-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6e5a3655 FindIce: Add support for version 3.6.3
| * | | | | | | | | | FindIce: Add support for version 3.6.3Roger Leigh2016-10-131-0/+1
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge topic 'msbuild-json'Brad King2016-10-131-0/+453
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ccdc3d30 Add a script to convert from MSBuild XML to a JSON format
| * | | | | | | | | | Add a script to convert from MSBuild XML to a JSON formatDon Olmstead2016-10-121-0/+453
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will supersede the `cmparseMSBuildXML.py` script once we have support for loading the JSON files instead of using hard-coded flag tables.