diff options
author | Bill Hoffman <bill.hoffman@kitware.com> | 2004-01-23 18:01:28 (GMT) |
---|---|---|
committer | Bill Hoffman <bill.hoffman@kitware.com> | 2004-01-23 18:01:28 (GMT) |
commit | bcc0b4018d7d2033712a935599634a89dca1cf12 (patch) | |
tree | 96fbda5e4e54fe923077420b6c692ef856a2ed5e | |
parent | ae0f6d9207f69f2197d358f29a2dc6f78e61e9f1 (diff) | |
download | CMake-bcc0b4018d7d2033712a935599634a89dca1cf12.zip CMake-bcc0b4018d7d2033712a935599634a89dca1cf12.tar.gz CMake-bcc0b4018d7d2033712a935599634a89dca1cf12.tar.bz2 |
BUG: more fixes for relative path stuff
-rw-r--r-- | Source/cmLocalUnixMakefileGenerator.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator.cxx b/Source/cmLocalUnixMakefileGenerator.cxx index 17a1032..45be308 100644 --- a/Source/cmLocalUnixMakefileGenerator.cxx +++ b/Source/cmLocalUnixMakefileGenerator.cxx @@ -491,7 +491,7 @@ void cmLocalUnixMakefileGenerator::OutputTargetRules(std::ostream& fout) path = m_LibraryOutputPath; path += this->GetFullTargetName(l->first.c_str(), l->second); 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 += 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 @@ -1498,7 +1498,7 @@ void cmLocalUnixMakefileGenerator::OutputUtilityRule(std::ostream& fout, depends += " \\\n"; replaceVars = *d; 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, |