diff options
| author | Brad King <brad.king@kitware.com> | 2010-06-04 18:32:08 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2010-06-04 18:32:08 (GMT) |
| commit | fdb5f78705f1a603d176a0976c931dd197567ff9 (patch) | |
| tree | 3133f91aaf9fe5aeb44cc1ff22c8d0379bc4a725 /Source/CPack | |
| parent | 3ac3dea6f0eb1ce68b321020ecdd336b3db8a0fe (diff) | |
| download | CMake-fdb5f78705f1a603d176a0976c931dd197567ff9.zip CMake-fdb5f78705f1a603d176a0976c931dd197567ff9.tar.gz CMake-fdb5f78705f1a603d176a0976c931dd197567ff9.tar.bz2 | |
CPack: Try harder to remove temporary dir (#10793)
Windows filesystems sometimes lock files temporarily. Try removing the
CPack temp install folder multiple times before giving up.
Diffstat (limited to 'Source/CPack')
| -rw-r--r-- | Source/CPack/cmCPackGenerator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx index 6224b40..4a4b428 100644 --- a/Source/CPack/cmCPackGenerator.cxx +++ b/Source/CPack/cmCPackGenerator.cxx @@ -789,7 +789,7 @@ int cmCPackGenerator::DoPackage() cmCPackLogger(cmCPackLog::LOG_VERBOSE, "Remove toplevel directory: " << toplevelDirectory << std::endl); - if ( !cmSystemTools::RemoveADirectory(toplevelDirectory) ) + if ( !cmSystemTools::RepeatedRemoveDirectory(toplevelDirectory) ) { cmCPackLogger(cmCPackLog::LOG_ERROR, "Problem removing toplevel directory: " @@ -1084,7 +1084,7 @@ int cmCPackGenerator::CleanTemporaryDirectory() cmCPackLogger(cmCPackLog::LOG_OUTPUT, "- Clean temporary : " << tempInstallDirectory << std::endl); - if(!cmsys::SystemTools::RemoveADirectory(tempInstallDirectory)) + if(!cmSystemTools::RepeatedRemoveDirectory(tempInstallDirectory)) { cmCPackLogger(cmCPackLog::LOG_ERROR, "Problem removing temporary directory: " << |