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

BUG: more fixes for relative path stuff

This commit is contained in:
Bill Hoffman 2004-01-23 13:01:28 -05:00
parent ae0f6d9207
commit bcc0b4018d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmLocalUnixMakefileGenerator.cxx
View File

@ -491,7 +491,7 @@ void cmLocalUnixMakefileGenerator::OutputTargetRules(std::ostream& fout)
path = m_LibraryOutputPath; path = m_LibraryOutputPath;
path += this->GetFullTargetName(l->first.c_str(), l->second); path += this->GetFullTargetName(l->first.c_str(), l->second);
fout << " \\\n" fout << " \\\n"
<< this->ConvertToRelativeOutputPath(path.c_str()); << this->ConvertToMakeTarget(this->ConvertToRelativeOutputPath(path.c_str()).c_str());
} }
} }
} }
@ -505,7 +505,7 @@ void cmLocalUnixMakefileGenerator::OutputTargetRules(std::ostream& fout)
{ {
path = m_ExecutableOutputPath; path = m_ExecutableOutputPath;
path += this->GetFullTargetName(l->first.c_str(), l->second); path += this->GetFullTargetName(l->first.c_str(), l->second);
fout << " \\\n" << this->ConvertToRelativeOutputPath(path.c_str()); fout << " \\\n" << this->ConvertToMakeTarget(this->ConvertToRelativeOutputPath(path.c_str()).c_str());
} }
} }
// list utilities last // list utilities last
@ -1498,7 +1498,7 @@ void cmLocalUnixMakefileGenerator::OutputUtilityRule(std::ostream& fout,
depends += " \\\n"; depends += " \\\n";
replaceVars = *d; replaceVars = *d;
m_Makefile->ExpandVariablesInString(replaceVars); m_Makefile->ExpandVariablesInString(replaceVars);
depends += this->ConvertToRelativeOutputPath(replaceVars.c_str()); depends += this->ConvertToMakeTarget(this->ConvertToRelativeOutputPath(replaceVars.c_str()).c_str());
} }
} }
this->OutputMakeRule(fout, comment.c_str(), name, this->OutputMakeRule(fout, comment.c_str(), name,