diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-06-21 18:16:37 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-06-21 18:17:18 (GMT) |
| commit | cfae7fa4082e73d4282be98fa99a07c18dd53d24 (patch) | |
| tree | 54d2fb4268aad425c231abd44148ad5cc6881e2e /Source | |
| parent | ccf7760f0035e2e0458ba59e29ab302a2d07c388 (diff) | |
| download | CMake-cfae7fa4082e73d4282be98fa99a07c18dd53d24.zip CMake-cfae7fa4082e73d4282be98fa99a07c18dd53d24.tar.gz CMake-cfae7fa4082e73d4282be98fa99a07c18dd53d24.tar.bz2 | |
cmMakefile: Use cmOutputConverter instead of cmLocalGenerator.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmMakefile.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 63dbe27..0338062 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -264,8 +264,8 @@ void cmMakefile::IssueMessage(cmake::MessageType t, if(!this->GetCMakeInstance()->GetIsInTryCompile()) { - lfc.FilePath = this->LocalGenerator->Convert(lfc.FilePath, - cmLocalGenerator::HOME); + cmOutputConverter converter(this->StateSnapshot); + lfc.FilePath = converter.Convert(lfc.FilePath, cmOutputConverter::HOME); } lfc.Line = 0; this->GetCMakeInstance()->IssueMessage(t, text, lfc); @@ -1963,8 +1963,8 @@ void cmMakefile::LogUnused(const char* reason, lfc.FilePath = path; lfc.Line = 0; } - lfc.FilePath = this->LocalGenerator->Convert(lfc.FilePath, - cmLocalGenerator::HOME); + cmOutputConverter converter(this->StateSnapshot); + lfc.FilePath = converter.Convert(lfc.FilePath, cmOutputConverter::HOME); if (this->CheckSystemVars || cmSystemTools::IsSubDirectory(path, @@ -2861,8 +2861,9 @@ cmake::MessageType cmMakefile::ExpandVariablesInStringNew( { std::ostringstream msg; cmListFileContext lfc; - lfc.FilePath = this->LocalGenerator - ->Convert(filename, cmLocalGenerator::HOME); + cmOutputConverter converter(this->StateSnapshot); + lfc.FilePath = + converter.Convert(filename, cmOutputConverter::HOME); lfc.Line = line; msg << "uninitialized variable \'" << lookup << "\'"; this->GetCMakeInstance()->IssueMessage(cmake::AUTHOR_WARNING, |