Browse Source

Merge topic 'try_compile-nfs' into release-3.18

a9a258c302 try_compile: Do not try to remove '.nfs*' files

Acked-by: Kitware Robot <[email protected]>
Acked-by: Robert Maynard <[email protected]>
Acked-by: Axel Huebl <[email protected]>
Merge-request: !4913
Brad King 5 years ago
parent
commit
c0b44e664b
1 changed files with 3 additions and 1 deletions
  1. 3 1
      Source/cmCoreTryCompile.cxx

+ 3 - 1
Source/cmCoreTryCompile.cxx

@@ -1050,7 +1050,9 @@ void cmCoreTryCompile::CleanupFiles(std::string const& binDir)
   std::set<std::string> deletedFiles;
   for (unsigned long i = 0; i < dir.GetNumberOfFiles(); ++i) {
     const char* fileName = dir.GetFile(i);
-    if (strcmp(fileName, ".") != 0 && strcmp(fileName, "..") != 0) {
+    if (strcmp(fileName, ".") != 0 && strcmp(fileName, "..") != 0 &&
+        // Do not delete NFS temporary files.
+        !cmHasPrefix(fileName, ".nfs")) {
       if (deletedFiles.insert(fileName).second) {
         std::string const fullPath =
           std::string(binDir).append("/").append(fileName);