浏览代码

BUG: fix #7471, only put build directories and CMakeFiles/ in the blacklist

Alex
Alexander Neundorf 17 年之前
父节点
当前提交
235cb0216f
共有 1 个文件被更改,包括 9 次插入4 次删除
  1. 9 4
      Source/cmGlobalKdevelopGenerator.cxx

+ 9 - 4
Source/cmGlobalKdevelopGenerator.cxx

@@ -280,9 +280,9 @@ void cmGlobalKdevelopGenerator
     }
     }
   else
   else
     {
     {
-    // add all subdirectories to the kdevelop blacklist
-    // so they are not monitored for added or removed files
-    // since this is basically handled by adding files to the cmake files
+    // add all subdirectories which are cmake build directories to the 
+    // kdevelop blacklist so they are not monitored for added or removed files
+    // since this is handled by adding files to the cmake files
     cmsys::Directory d;
     cmsys::Directory d;
     if (d.Load(projectDir.c_str()))
     if (d.Load(projectDir.c_str()))
       {
       {
@@ -297,7 +297,12 @@ void cmGlobalKdevelopGenerator
           tmp += nextFile;
           tmp += nextFile;
           if (cmSystemTools::FileIsDirectory(tmp.c_str()))
           if (cmSystemTools::FileIsDirectory(tmp.c_str()))
             {
             {
-            this->Blacklist.push_back(nextFile);
+            tmp += "/CMakeCache.txt";
+            if ((nextFile == "CMakeFiles") 
+                || (cmSystemTools::FileExists(tmp.c_str())))
+              {
+              this->Blacklist.push_back(nextFile);
+              }
             }
             }
           }
           }
         }
         }