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

COMP: Fix calls to superclass methods for Borland 

The superclass of cmSystemTools is cmsys::SystemTools, which should be
referencable by just SystemTools from inside the class.  Borland C++
does not seem to support this, so we use cmSystemTools instead.
This commit is contained in:
Brad King 2009-04-22 09:11:06 -04:00
parent b1005a0e5e
commit efe07c4e0a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmSystemTools.cxx
View File

@ -1101,14 +1101,14 @@ std::string cmSystemTools::FileExistsInParentDirectories(const char* fname,
const char* directory, const char* toplevel) const char* directory, const char* toplevel)
{ {
std::string file = fname; std::string file = fname;
SystemTools::ConvertToUnixSlashes(file); cmSystemTools::ConvertToUnixSlashes(file);
std::string dir = directory; std::string dir = directory;
SystemTools::ConvertToUnixSlashes(dir); cmSystemTools::ConvertToUnixSlashes(dir);
std::string prevDir; std::string prevDir;
while(dir != prevDir) while(dir != prevDir)
{ {
std::string path = dir + "/" + file; std::string path = dir + "/" + file;
if ( SystemTools::FileExists(path.c_str()) ) if ( cmSystemTools::FileExists(path.c_str()) )
{ {
return path; return path;
} }
@ -1117,7 +1117,7 @@ std::string cmSystemTools::FileExistsInParentDirectories(const char* fname,
break; break;
} }
prevDir = dir; prevDir = dir;
dir = SystemTools::GetParentDirectory(dir.c_str()); dir = cmSystemTools::GetParentDirectory(dir.c_str());
} }
return ""; return "";
} }