kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Convert: Remove last uses of HOME enum value

This commit is contained in:
Stephen Kelly 2016-09-06 22:59:59 +02:00
parent 495e26ae57
commit 0a98c74c1b
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmGlobalNinjaGenerator.cxx
View File

@ -774,8 +774,8 @@ std::string cmGlobalNinjaGenerator::ConvertToNinjaFolderRule(
{ {
cmLocalNinjaGenerator* ng = cmLocalNinjaGenerator* ng =
static_cast<cmLocalNinjaGenerator*>(this->LocalGenerators[0]); static_cast<cmLocalNinjaGenerator*>(this->LocalGenerators[0]);
std::string convPath = std::string convPath = ng->ConvertToRelativePath(
ng->ConvertToRelativePath(path + "/all", cmOutputConverter::HOME); this->LocalGenerators[0]->GetState()->GetSourceDirectory(), path + "/all");
convPath = this->NinjaOutputPath(convPath); convPath = this->NinjaOutputPath(convPath);
#ifdef _WIN32 #ifdef _WIN32
std::replace(convPath.begin(), convPath.end(), '/', '\\'); std::replace(convPath.begin(), convPath.end(), '/', '\\');

8
Source/cmListFileCache.cxx
View File

@ -404,8 +404,8 @@ void cmListFileBacktrace::PrintTitle(std::ostream& out) const
cmOutputConverter converter(this->Bottom); cmOutputConverter converter(this->Bottom);
cmListFileContext lfc = *this->Cur; cmListFileContext lfc = *this->Cur;
if (!this->Bottom.GetState()->GetIsInTryCompile()) { if (!this->Bottom.GetState()->GetIsInTryCompile()) {
lfc.FilePath = lfc.FilePath = converter.ConvertToRelativePath(
converter.ConvertToRelativePath(lfc.FilePath, cmOutputConverter::HOME); this->Bottom.GetState()->GetSourceDirectory(), lfc.FilePath);
} }
out << (lfc.Line ? " at " : " in ") << lfc; out << (lfc.Line ? " at " : " in ") << lfc;
} }
@ -430,8 +430,8 @@ void cmListFileBacktrace::PrintCallStack(std::ostream& out) const
} }
cmListFileContext lfc = *i; cmListFileContext lfc = *i;
if (!this->Bottom.GetState()->GetIsInTryCompile()) { if (!this->Bottom.GetState()->GetIsInTryCompile()) {
lfc.FilePath = lfc.FilePath = converter.ConvertToRelativePath(
converter.ConvertToRelativePath(lfc.FilePath, cmOutputConverter::HOME); this->Bottom.GetState()->GetSourceDirectory(), lfc.FilePath);
} }
out << " " << lfc << "\n"; out << " " << lfc << "\n";
} }

4
Source/cmTarget.cxx
View File

@ -596,8 +596,8 @@ void cmTarget::GetTllSignatureTraces(std::ostream& s, TLLSignature sig) const
it != this->TLLCommands.end(); ++it) { it != this->TLLCommands.end(); ++it) {
if (it->first == sig) { if (it->first == sig) {
cmListFileContext lfc = it->second; cmListFileContext lfc = it->second;
lfc.FilePath = lfc.FilePath = converter.ConvertToRelativePath(
converter.ConvertToRelativePath(lfc.FilePath, cmOutputConverter::HOME); this->Makefile->GetState()->GetSourceDirectory(), lfc.FilePath);
s << " * " << lfc << std::endl; s << " * " << lfc << std::endl;
} }
} }