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

BUG: Remove instances of // in the output

This commit is contained in:
Andy Cedilnik 2004-10-19 12:48:57 -04:00
parent cafd48a7f2
commit 429cf9d612
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/cmCTest.cxx
View File

@ -2123,14 +2123,17 @@ void cmCTest::PopulateCustomVector(cmMakefile* mf, const char* def, tm_VectorOfS
}
}
std::string cmCTest::GetShortPathToFile(const char* fname)
std::string cmCTest::GetShortPathToFile(const char* cfname)
{
const std::string& sourceDir = GetDartConfiguration("SourceDirectory");
const std::string& buildDir = GetDartConfiguration("BuildDirectory");
std::string fname = cmSystemTools::CollapseFullPath(cfname);
// Find relative paths to both directories
std::string srcRelpath = cmSystemTools::RelativePath(sourceDir.c_str(), fname);
std::string bldRelpath = cmSystemTools::RelativePath(buildDir.c_str(), fname);
std::string srcRelpath
= cmSystemTools::RelativePath(sourceDir.c_str(), fname.c_str());
std::string bldRelpath
= cmSystemTools::RelativePath(buildDir.c_str(), fname.c_str());
// If any contains "." it is not parent directory
bool inSrc = srcRelpath.find("..") == srcRelpath.npos;