[Cmake-commits] [cmake-commits] alex committed cmGlobalKdevelopGenerator.cxx 1.31 1.32

[cmake-commits at cmake.org]

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

Modified Files:
	cmGlobalKdevelopGenerator.cxx 
Log Message:
BUG: fix #7471, only put build directories and CMakeFiles/ in the blacklist

Alex


Index: cmGlobalKdevelopGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalKdevelopGenerator.cxx,v
retrieving revision 1.31
retrieving revision 1.32
diff -C 2 -d -r1.31 -r1.32
*** cmGlobalKdevelopGenerator.cxx	27 Mar 2008 21:40:43 -0000	1.31
--- cmGlobalKdevelopGenerator.cxx	16 Aug 2008 20:33:47 -0000	1.32
***************
*** 281,287 ****
    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
      cmsys::Directory d;
      if (d.Load(projectDir.c_str()))
--- 281,287 ----
    else
      {
!     // 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;
      if (d.Load(projectDir.c_str()))
***************
*** 298,302 ****
            if (cmSystemTools::FileIsDirectory(tmp.c_str()))
              {
!             this->Blacklist.push_back(nextFile);
              }
            }
--- 298,307 ----
            if (cmSystemTools::FileIsDirectory(tmp.c_str()))
              {
!             tmp += "/CMakeCache.txt";
!             if ((nextFile == "CMakeFiles") 
!                 || (cmSystemTools::FileExists(tmp.c_str())))
!               {
!               this->Blacklist.push_back(nextFile);
!               }
              }
            }