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

BUG: Removed instances of calling ConvertToRelativeOutputPath twice on the same path.

This commit is contained in:
Brad King 2005-02-24 19:32:50 -05:00
parent de47b43c6f
commit c56045f2e2
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Source/cmLocalUnixMakefileGenerator.cxx
View File

@ -887,7 +887,7 @@ void cmLocalUnixMakefileGenerator::OutputLibraryRule(std::ostream& fout,
this->OutputMakeRule(fout, this->OutputMakeRule(fout,
comment, comment,
name, name,
this->ConvertToRelativeOutputPath(tgt.c_str()).c_str(), tgt.c_str(),
0); 0);
} }
@ -1040,17 +1040,15 @@ void cmLocalUnixMakefileGenerator::OutputExecutableRule(std::ostream& fout,
#endif #endif
target += name; target += name;
target += cmSystemTools::GetExecutableExtension(); target += cmSystemTools::GetExecutableExtension();
target = this->ConvertToRelativeOutputPath(target.c_str());
bool needsLocalTarget = false; bool needsLocalTarget = false;
if(m_UseRelativePaths) if(m_UseRelativePaths)
{ {
cmSystemTools::ConvertToUnixSlashes(target); std::string tgt =
std::string tgt = this->ConvertToMakeTarget(target.c_str()); this->ConvertToMakeTarget(this->ConvertToRelativeOutputPath(target.c_str()).c_str());
if(tgt.find('/', 0) != tgt.npos) if(tgt.find('/', 0) != tgt.npos)
{ {
needsLocalTarget = true; needsLocalTarget = true;
} }
target = cmSystemTools::ConvertToOutputPath(target.c_str());
} }
else else
{ {
@ -1146,7 +1144,7 @@ void cmLocalUnixMakefileGenerator::OutputExecutableRule(std::ostream& fout,
this->ExpandRuleVariables(*i, this->ExpandRuleVariables(*i,
linkLanguage, linkLanguage,
objs.c_str(), objs.c_str(),
target.c_str(), this->ConvertToRelativeOutputPath(target.c_str()).c_str(),
linklibs.str().c_str(), linklibs.str().c_str(),
0, 0,
0, 0,
@ -1167,10 +1165,9 @@ void cmLocalUnixMakefileGenerator::OutputExecutableRule(std::ostream& fout,
// try-compile to work in this case. // try-compile to work in this case.
if(needsLocalTarget) if(needsLocalTarget)
{ {
depend = target; depend = this->ConvertToRelativeOutputPath(target.c_str());
target = name; target = name;
target += cmSystemTools::GetExecutableExtension(); target += cmSystemTools::GetExecutableExtension();
target = this->ConvertToRelativeOutputPath(target.c_str());
commands.resize(0); commands.resize(0);
this->OutputMakeRule(fout, this->OutputMakeRule(fout,
comment.c_str(), comment.c_str(),
@ -1184,7 +1181,8 @@ void cmLocalUnixMakefileGenerator::OutputExecutableRule(std::ostream& fout,
// correctly. Do not duplicate this target. // correctly. Do not duplicate this target.
if(target != name) if(target != name)
{ {
this->OutputMakeRule(fout, comment.c_str(), name, target.c_str(), 0); this->OutputMakeRule(fout, comment.c_str(), name,
this->ConvertToRelativeOutputPath(target.c_str()).c_str(), 0);
} }
} }
@ -2172,7 +2170,6 @@ void cmLocalUnixMakefileGenerator::OutputMakeRules(std::ostream& fout)
std::string checkCache = m_Makefile->GetHomeOutputDirectory(); std::string checkCache = m_Makefile->GetHomeOutputDirectory();
checkCache += "/cmake.check_cache"; checkCache += "/cmake.check_cache";
checkCache = this->ConvertToRelativeOutputPath(checkCache.c_str());
std::vector<std::string> cmake_depends; std::vector<std::string> cmake_depends;
cmake_depends.push_back("$(CMAKE_MAKEFILE_SOURCES)"); cmake_depends.push_back("$(CMAKE_MAKEFILE_SOURCES)");
@ -2247,7 +2244,6 @@ void cmLocalUnixMakefileGenerator::OutputMakeRules(std::ostream& fout)
} }
std::string cacheFile = m_Makefile->GetHomeOutputDirectory(); std::string cacheFile = m_Makefile->GetHomeOutputDirectory();
cacheFile += "/CMakeCache.txt"; cacheFile += "/CMakeCache.txt";
cacheFile = this->ConvertToRelativeOutputPath(cacheFile.c_str());
this->OutputMakeRule(fout, this->OutputMakeRule(fout,
"CMakeCache.txt", "CMakeCache.txt",
cacheFile.c_str(), cacheFile.c_str(),