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

ENH: Removed useless method ConvertToMakeTarget and all calls to it. It had a buggy implementation that caused it to do nothing.

Browse Source
This commit is contained in:
Brad King 2007-03-08 11:10:21 -05:00
parent 4089c76890
commit 00051cf721
3 changed files with 0 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/cmGlobalUnixMakefileGenerator3.cxx
View File

@ -605,7 +605,6 @@ std::string cmGlobalUnixMakefileGenerator3
} }
tname = lg->Convert(tname.c_str(),cmLocalGenerator::HOME_OUTPUT, tname = lg->Convert(tname.c_str(),cmLocalGenerator::HOME_OUTPUT,
cmLocalGenerator::MAKEFILE); cmLocalGenerator::MAKEFILE);
tname = lg->ConvertToMakeTarget(tname.c_str());
makeCommand += tname.c_str(); makeCommand += tname.c_str();
makeCommand += "\""; makeCommand += "\"";
if (!this->LocalGenerators.size()) if (!this->LocalGenerators.size())

25
Source/cmLocalUnixMakefileGenerator3.cxx
View File

@ -564,7 +564,6 @@ cmLocalUnixMakefileGenerator3
// Construct the left hand side of the rule. // Construct the left hand side of the rule.
replace = target; replace = target;
std::string tgt = this->Convert(replace.c_str(),HOME_OUTPUT,MAKEFILE); std::string tgt = this->Convert(replace.c_str(),HOME_OUTPUT,MAKEFILE);
tgt = this->ConvertToMakeTarget(tgt.c_str());
const char* space = ""; const char* space = "";
if(tgt.size() == 1) if(tgt.size() == 1)
{ {
@ -598,7 +597,6 @@ cmLocalUnixMakefileGenerator3
{ {
replace = *dep; replace = *dep;
replace = this->Convert(replace.c_str(),HOME_OUTPUT,MAKEFILE); replace = this->Convert(replace.c_str(),HOME_OUTPUT,MAKEFILE);
replace = this->ConvertToMakeTarget(replace.c_str());
os << tgt.c_str() << space << ": " << replace.c_str() << "\n"; os << tgt.c_str() << space << ": " << replace.c_str() << "\n";
} }
} }
@ -1089,28 +1087,6 @@ cmLocalUnixMakefileGenerator3::AppendEcho(std::vector<std::string>& commands,
} }
} }
//----------------------------------------------------------------------------
//take a tgt path and convert it into a make target, it could be full, or
//relative
std::string cmLocalUnixMakefileGenerator3
::ConvertToMakeTarget(const char* tgt)
{
// Make targets should not have a leading './' for a file in the
// directory containing the makefile.
std::string ret = tgt;
if(ret.size() > 2 && (ret[0] == '.') &&
( (ret[1] == '/') || ret[1] == '\\'))
{
std::string upath = ret;
cmSystemTools::ConvertToUnixSlashes(upath);
if(upath.find(2, '/') == upath.npos)
{
ret = ret.substr(2, ret.size()-2);
}
}
return ret;
}
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
std::string std::string
cmLocalUnixMakefileGenerator3 cmLocalUnixMakefileGenerator3
@ -1770,7 +1746,6 @@ cmLocalUnixMakefileGenerator3
if (tgt && tgt[0] != '\0') if (tgt && tgt[0] != '\0')
{ {
std::string tgt2 = this->Convert(tgt,HOME_OUTPUT,MAKEFILE); std::string tgt2 = this->Convert(tgt,HOME_OUTPUT,MAKEFILE);
tgt2 = this->ConvertToMakeTarget(tgt2.c_str());
// for make -f foo bar, foo is a file but bar (tgt2) is // for make -f foo bar, foo is a file but bar (tgt2) is
// a make target. make targets should be escaped with "" // a make target. make targets should be escaped with ""
// and not \, so if we find a "\ " in the path then remove // and not \, so if we find a "\ " in the path then remove

3
Source/cmLocalUnixMakefileGenerator3.h
View File

@ -186,9 +186,6 @@ public:
std::string CreateMakeVariable(const char* sin, const char* s2in); std::string CreateMakeVariable(const char* sin, const char* s2in);
// cleanup the name of a potential target
std::string ConvertToMakeTarget(const char* tgt);
/** Called from command-line hook to scan dependencies. */ /** Called from command-line hook to scan dependencies. */
virtual bool ScanDependencies(const char* tgtInfo); virtual bool ScanDependencies(const char* tgtInfo);