cmMakefile: Use cmOutputConverter instead of cmLocalGenerator.
This commit is contained in:
parent
ccf7760f00
commit
cfae7fa408
|
@ -264,8 +264,8 @@ void cmMakefile::IssueMessage(cmake::MessageType t,
|
||||||
|
|
||||||
if(!this->GetCMakeInstance()->GetIsInTryCompile())
|
if(!this->GetCMakeInstance()->GetIsInTryCompile())
|
||||||
{
|
{
|
||||||
lfc.FilePath = this->LocalGenerator->Convert(lfc.FilePath,
|
cmOutputConverter converter(this->StateSnapshot);
|
||||||
cmLocalGenerator::HOME);
|
lfc.FilePath = converter.Convert(lfc.FilePath, cmOutputConverter::HOME);
|
||||||
}
|
}
|
||||||
lfc.Line = 0;
|
lfc.Line = 0;
|
||||||
this->GetCMakeInstance()->IssueMessage(t, text, lfc);
|
this->GetCMakeInstance()->IssueMessage(t, text, lfc);
|
||||||
|
@ -1963,8 +1963,8 @@ void cmMakefile::LogUnused(const char* reason,
|
||||||
lfc.FilePath = path;
|
lfc.FilePath = path;
|
||||||
lfc.Line = 0;
|
lfc.Line = 0;
|
||||||
}
|
}
|
||||||
lfc.FilePath = this->LocalGenerator->Convert(lfc.FilePath,
|
cmOutputConverter converter(this->StateSnapshot);
|
||||||
cmLocalGenerator::HOME);
|
lfc.FilePath = converter.Convert(lfc.FilePath, cmOutputConverter::HOME);
|
||||||
|
|
||||||
if (this->CheckSystemVars ||
|
if (this->CheckSystemVars ||
|
||||||
cmSystemTools::IsSubDirectory(path,
|
cmSystemTools::IsSubDirectory(path,
|
||||||
|
@ -2861,8 +2861,9 @@ cmake::MessageType cmMakefile::ExpandVariablesInStringNew(
|
||||||
{
|
{
|
||||||
std::ostringstream msg;
|
std::ostringstream msg;
|
||||||
cmListFileContext lfc;
|
cmListFileContext lfc;
|
||||||
lfc.FilePath = this->LocalGenerator
|
cmOutputConverter converter(this->StateSnapshot);
|
||||||
->Convert(filename, cmLocalGenerator::HOME);
|
lfc.FilePath =
|
||||||
|
converter.Convert(filename, cmOutputConverter::HOME);
|
||||||
lfc.Line = line;
|
lfc.Line = line;
|
||||||
msg << "uninitialized variable \'" << lookup << "\'";
|
msg << "uninitialized variable \'" << lookup << "\'";
|
||||||
this->GetCMakeInstance()->IssueMessage(cmake::AUTHOR_WARNING,
|
this->GetCMakeInstance()->IssueMessage(cmake::AUTHOR_WARNING,
|
||||||
|
|
Loading…
Reference in New Issue