[Cmake-commits] [cmake-commits] hoffman committed cmCoreTryCompile.cxx 1.7.2.1 1.7.2.2

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv30540/Source

Modified Files:
      Tag: CMake-2-6
	cmCoreTryCompile.cxx 
Log Message:
ENH: merge in from main tree


Index: cmCoreTryCompile.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmCoreTryCompile.cxx,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -C 2 -d -r1.7.2.1 -r1.7.2.2
*** cmCoreTryCompile.cxx	24 Mar 2008 22:23:26 -0000	1.7.2.1
--- cmCoreTryCompile.cxx	26 Mar 2008 18:08:25 -0000	1.7.2.2
***************
*** 360,366 ****
            if(!cmSystemTools::RemoveFile(fullPath.c_str()))
              {
!             std::string m = "Remove failed on file: ";
!             m += fullPath;
!             cmSystemTools::ReportLastSystemError(m.c_str());
              }
            }
--- 360,383 ----
            if(!cmSystemTools::RemoveFile(fullPath.c_str()))
              {
!             bool removed = false;
!             int numAttempts = 0;
!             // sometimes anti-virus software hangs on to
!             // new files and we can not delete them, so try
!             // 5 times with .5 second delay between tries.
!             while(!removed && numAttempts < 5)
!               {
!               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());
!               }
              }
            }