diff options
| author | Stephen Kelly <steveire@gmail.com> | 2016-10-09 08:34:50 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2016-10-15 09:25:12 (GMT) |
| commit | b59b6dd9d27de7839c7b23a3094db33298038896 (patch) | |
| tree | 2b36fbb568918ef952f0f59beaa15363f09b400f /Source/cmLocalGenerator.cxx | |
| parent | bdddd4234e977f65ee7df8adcd3888706dfd0dda (diff) | |
| download | CMake-b59b6dd9d27de7839c7b23a3094db33298038896.zip CMake-b59b6dd9d27de7839c7b23a3094db33298038896.tar.gz CMake-b59b6dd9d27de7839c7b23a3094db33298038896.tar.bz2 | |
cmRulePlaceholderExpander: Port clients to direct-use
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.
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 615168d..1c3a97d 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -133,6 +133,13 @@ cmLocalGenerator::cmLocalGenerator(cmGlobalGenerator* gg, cmMakefile* makefile) } } +cmRulePlaceholderExpander* cmLocalGenerator::CreateRulePlaceholderExpander() + const +{ + return new cmRulePlaceholderExpander(this->Compilers, this->VariableMappings, + this->CompilerSysroot); +} + cmLocalGenerator::~cmLocalGenerator() { cmDeleteAll(this->GeneratorTargets); @@ -561,17 +568,6 @@ cmState::Snapshot cmLocalGenerator::GetStateSnapshot() const return this->Makefile->GetStateSnapshot(); } -void cmLocalGenerator::ExpandRuleVariables(cmOutputConverter* outputConverter, - std::string& s, - const RuleVariables& replaceValues) -{ - cmRulePlaceholderExpander rulePlaceholderExpander( - this->Compilers, this->VariableMappings, this->CompilerSysroot); - rulePlaceholderExpander.SetTargetImpLib(this->TargetImplib); - rulePlaceholderExpander.ExpandRuleVariables(outputConverter, s, - replaceValues); -} - const char* cmLocalGenerator::GetRuleLauncher(cmGeneratorTarget* target, const std::string& prop) { |