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

ENH: fix for hp make and relative paths never have targets with a ./ at the start of the name

This commit is contained in:
Bill Hoffman 2004-01-06 16:18:38 -05:00
parent c83f3b3c4c
commit d1efed1415
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/cmLocalGenerator.cxx
View File

@ -192,5 +192,16 @@ std::string cmLocalGenerator::ConvertToRelativeOutputPath(const char* p)
} }
} }
ret = cmSystemTools::ConvertToOutputPath(ret.c_str()); ret = cmSystemTools::ConvertToOutputPath(ret.c_str());
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; return ret;
} }

8
Source/cmLocalUnixMakefileGenerator.cxx
View File

@ -1325,13 +1325,7 @@ void cmLocalUnixMakefileGenerator::OutputExecutableRule(std::ostream& fout,
target = this->ConvertToRelativeOutputPath(target.c_str()); target = this->ConvertToRelativeOutputPath(target.c_str());
cmSystemTools::ConvertToUnixSlashes(target); cmSystemTools::ConvertToUnixSlashes(target);
bool needsLocalTarget = false; bool needsLocalTarget = false;
unsigned int startPos = 2; unsigned int startPos = 0;
if(m_Makefile->GetDefinition("BORLAND"))
{
// the borland makefiles treat .\target and target as different
// targets. All other makes treat them the same
startPos = 0;
}
if(target.find('/', startPos) != target.npos) if(target.find('/', startPos) != target.npos)
{ {
needsLocalTarget = true; needsLocalTarget = true;