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

BUG: work around for buggy Tigger OSX systems that read two copies of the same file in a directory

Browse Source
This commit is contained in:
Bill Hoffman 2005-04-15 10:46:19 -04:00
parent 6c68c81475
commit b1541f3ee5
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Source/cmTryCompileCommand.cxx
View File

@ -282,25 +282,32 @@ void cmTryCompileCommand::CleanupFiles(const char* binDir)
cmsys::Directory dir; cmsys::Directory dir;
dir.Load(binDir); dir.Load(binDir);
size_t fileNum; size_t fileNum;
std::set<cmStdString> deletedFiles;
for (fileNum = 0; fileNum < dir.GetNumberOfFiles(); ++fileNum) for (fileNum = 0; fileNum < dir.GetNumberOfFiles(); ++fileNum)
{ {
if (strcmp(dir.GetFile(static_cast<unsigned long>(fileNum)),".") && if (strcmp(dir.GetFile(static_cast<unsigned long>(fileNum)),".") &&
strcmp(dir.GetFile(static_cast<unsigned long>(fileNum)),"..")) strcmp(dir.GetFile(static_cast<unsigned long>(fileNum)),".."))
{ {
std::string fullPath = binDir;
fullPath += "/"; if(deletedFiles.find( dir.GetFile(static_cast<unsigned long>(fileNum)))
fullPath += dir.GetFile(static_cast<unsigned long>(fileNum)); == deletedFiles.end())
if(cmSystemTools::FileIsDirectory(fullPath.c_str()))
{ {
cmTryCompileCommand::CleanupFiles(fullPath.c_str()); deletedFiles.insert(dir.GetFile(static_cast<unsigned long>(fileNum)));
} std::string fullPath = binDir;
else fullPath += "/";
{ fullPath += dir.GetFile(static_cast<unsigned long>(fileNum));
if(!cmSystemTools::RemoveFile(fullPath.c_str())) if(cmSystemTools::FileIsDirectory(fullPath.c_str()))
{ {
std::string m = "Remove failed on file: "; cmTryCompileCommand::CleanupFiles(fullPath.c_str());
m += fullPath; }
cmSystemTools::ReportLastSystemError(m.c_str()); else
{
if(!cmSystemTools::RemoveFile(fullPath.c_str()))
{
std::string m = "Remove failed on file: ";
m += fullPath;
cmSystemTools::ReportLastSystemError(m.c_str());
}
} }
} }
} }