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

BUG: if the paths share nothing then just return the remote path with no ..

This commit is contained in:
Bill Hoffman 2004-10-19 13:02:42 -04:00
parent 429cf9d612
commit e9b6e65cbd
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/cmSystemTools.cxx
View File

@ -1221,15 +1221,6 @@ std::string cmSystemTools::RelativePath(const char* local, const char* remote)
cmSystemTools::Error("RelativePath must be passed a full path to remote: ", remote); cmSystemTools::Error("RelativePath must be passed a full path to remote: ", remote);
} }
// check for driveletter: as the start of the path
// if not on the same drive then full path to local must be used.
if(local[0] && local[0] != '/')
{
if(remote[0] && local[0] != remote[0])
{
return remote;
}
}
// split up both paths into arrays of strings using / as a separator // split up both paths into arrays of strings using / as a separator
std::string localString = local; std::string localString = local;
std::vector<cmStdString> localSplit = cmSystemTools::SplitString(local, '/', true); std::vector<cmStdString> localSplit = cmSystemTools::SplitString(local, '/', true);
@ -1257,7 +1248,12 @@ std::string cmSystemTools::RelativePath(const char* local, const char* remote)
remoteSplit[sameCount] = ""; remoteSplit[sameCount] = "";
sameCount++; sameCount++;
} }
// If there is nothing in common with the paths, then just return the remote
if(sameCount == 0)
{
return remote;
}
// for each entry that is not common in the local path // for each entry that is not common in the local path
// add a ../ to the finalpath array, this gets us out of the local // add a ../ to the finalpath array, this gets us out of the local
// path into the remote dir // path into the remote dir