echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmGeneratorExpressionInterpreter::Evaluate: remove const char* overload

Browse Source
This commit is contained in:
Vitaly Stakhovsky 2020-07-11 11:41:19 -04:00
parent fd1df4995b
commit 43f7b17816
3 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmGeneratorExpression.cxx
View File

@ -406,9 +406,3 @@ const std::string& cmGeneratorExpressionInterpreter::Evaluate(
this->LocalGenerator, this->Config, this->HeadTarget, &dagChecker, nullptr,
this->Language);
}
const std::string& cmGeneratorExpressionInterpreter::Evaluate(
const char* expression, const std::string& property)
{
return this->Evaluate(std::string(expression ? expression : ""), property);
}

2
Source/cmGeneratorExpression.h
View File

@ -199,8 +199,6 @@ public:
const std::string& Evaluate(std::string expression,
const std::string& property);
const std::string& Evaluate(const char* expression,
const std::string& property);
protected:
cmGeneratorExpression GeneratorExpression;

8
Source/cmGeneratorTarget.cxx
View File

@ -5411,8 +5411,7 @@ bool getTypedProperty<bool>(cmGeneratorTarget const* tgt,
}
cmProp value = tgt->GetProperty(prop);
return cmIsOn(
genexInterpreter->Evaluate(value ? value->c_str() : nullptr, prop));
return cmIsOn(genexInterpreter->Evaluate(value ? *value : "", prop));
}
template <>
@ -5426,8 +5425,7 @@ const char* getTypedProperty<const char*>(
return value ? value->c_str() : nullptr;
}
return genexInterpreter->Evaluate(value ? value->c_str() : nullptr, prop)
.c_str();
return genexInterpreter->Evaluate(value ? *value : "", prop).c_str();
}
template <>
@ -5441,7 +5439,7 @@ std::string getTypedProperty<std::string>(
return valueAsString(value ? value->c_str() : nullptr);
}
return genexInterpreter->Evaluate(value ? value->c_str() : nullptr, prop);
return genexInterpreter->Evaluate(value ? *value : "", prop);
}
template <typename PropertyType>