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

Merge topic 'try_compile-RemoveFile' 

097294e Fix try_compile RemoveFile anti-virus loop (#11503)
This commit is contained in:
Brad King 2010-12-16 14:00:28 -05:00 committed by CMake Topic Stage
parent 6b61c04330 097294e667
commit 72ebd4ee12
1 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Source/cmCoreTryCompile.cxx
View File

@ -397,28 +397,18 @@ void cmCoreTryCompile::CleanupFiles(const char* binDir)
} }
else else
{ {
if(!cmSystemTools::RemoveFile(fullPath.c_str())) // Sometimes anti-virus software hangs on to new files so we
// cannot delete them immediately. Try a few times.
int tries = 5;
while(!cmSystemTools::RemoveFile(fullPath.c_str()) &&
--tries && cmSystemTools::FileExists(fullPath.c_str()))
{ {
bool removed = false; cmSystemTools::Delay(500);
int numAttempts = 0; }
// sometimes anti-virus software hangs on to if(tries == 0)
// new files and we can not delete them, so try {
// 5 times with .5 second delay between tries. std::string m = "Remove failed on file: " + fullPath;
while(!removed && numAttempts < 5) cmSystemTools::ReportLastSystemError(m.c_str());
{
cmSystemTools::Delay(500);
if(cmSystemTools::RemoveFile(fullPath.c_str()))
{
removed = true;
}
numAttempts++;
}
if(!removed)
{
std::string m = "Remove failed on file: ";
m += fullPath;
cmSystemTools::ReportLastSystemError(m.c_str());
}
} }
} }
} }