Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-19 02:17:27 +08:00
Code Issues Projects Releases Wiki Activity

try_compile: Improve error message when a file cannot be removed

Browse Source
This commit is contained in:
Brad King
2021-04-15 12:02:16 -04:00
parent 79a2f1e22a
commit c2d2772f15
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Source/cmCoreTryCompile.cxx
View File

@@ -1015,17 +1015,21 @@ void cmCoreTryCompile::CleanupFiles(std::string const& binDir)
// cannot delete them immediately. Try a few times. // cannot delete them immediately. Try a few times.
cmSystemTools::WindowsFileRetry retry = cmSystemTools::WindowsFileRetry retry =
cmSystemTools::GetWindowsFileRetry(); cmSystemTools::GetWindowsFileRetry();
while (!cmSystemTools::RemoveFile(fullPath) && --retry.Count && cmsys::Status status;
cmSystemTools::FileExists(fullPath)) { while (!((status = cmSystemTools::RemoveFile(fullPath))) &&
--retry.Count && cmSystemTools::FileExists(fullPath)) {
cmSystemTools::Delay(retry.Delay); cmSystemTools::Delay(retry.Delay);
} }
if (retry.Count == 0) if (retry.Count == 0)
#else #else
if (!cmSystemTools::RemoveFile(fullPath)) cmsys::Status status = cmSystemTools::RemoveFile(fullPath);
if (!status)
#endif #endif
{ {
std::string m = "Remove failed on file: " + fullPath; this->Makefile->IssueMessage(
cmSystemTools::ReportLastSystemError(m.c_str()); MessageType::FATAL_ERROR,
cmStrCat("The file:\n ", fullPath,
"\ncould not be removed:\n ", status.GetString()));
} }
} }
} }