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 | c75a9d660169ddd1e7be57486d3813ca73886b55 (patch) | |
| tree | 7860793701f600ac504ebf7c104824ebd09aa3b2 /Source/cmLocalGenerator.cxx | |
| parent | 46ad0d2183230d1af93242efbdcce20d55514efb (diff) | |
| download | CMake-c75a9d660169ddd1e7be57486d3813ca73886b55.zip CMake-c75a9d660169ddd1e7be57486d3813ca73886b55.tar.gz CMake-c75a9d660169ddd1e7be57486d3813ca73886b55.tar.bz2 | |
cmLocalGenerator: Use strings instead of a Target in rule replacement
Don't rely on the cmGeneratorTarget type needlessly.
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 6dd90c8..fad7fae 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -724,12 +724,14 @@ std::string cmLocalGenerator::ExpandRuleVariable( return replaceValues.Language; } } - if (replaceValues.CMTarget) { + if (replaceValues.CMTargetName) { if (variable == "TARGET_NAME") { - return replaceValues.CMTarget->GetName(); + return replaceValues.CMTargetName; } + } + if (replaceValues.CMTargetType) { if (variable == "TARGET_TYPE") { - return cmState::GetTargetTypeName(replaceValues.CMTarget->GetType()); + return replaceValues.CMTargetType; } } if (replaceValues.Output) { @@ -747,7 +749,7 @@ std::string cmLocalGenerator::ExpandRuleVariable( this->Compilers.find(variable); if (compIt != this->Compilers.end()) { - std::string ret = this->ConvertToOutputForExisting( + std::string ret = outputConverter->ConvertToOutputForExisting( this->VariableMappings["CMAKE_" + compIt->second + "_COMPILER"]); std::string const& compilerArg1 = this->VariableMappings[compIt->first + "_COMPILER_ARG1"]; |