[Cmake-commits] [cmake-commits] king committed cmFindPathCommand.cxx 1.43 1.44

cmake-commits at cmake.org cmake-commits at cmake.org
Mon Jun 9 12:51:06 EDT 2008


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

Modified Files:
	cmFindPathCommand.cxx 
Log Message:
ENH: Improve framework search speed for find_file and find_path

  - Locating a header inside a framework often requires globbing
  - Previously the glob was <dir>/*/Headers/<name>
  - Now the glob is <dir>/*.framework/Headers/<name>
  - This is much faster when <dir> is not really a framework dir


Index: cmFindPathCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmFindPathCommand.cxx,v
retrieving revision 1.43
retrieving revision 1.44
diff -C 2 -d -r1.43 -r1.44
*** cmFindPathCommand.cxx	9 Jun 2008 15:58:29 -0000	1.43
--- cmFindPathCommand.cxx	9 Jun 2008 16:51:01 -0000	1.44
***************
*** 177,183 ****
      }
    // if it is not found yet or not a framework header, then do a glob search
!   // for all files in dir/*/Headers/
    cmStdString glob = dir;
!   glob += "*/Headers/";
    glob += file;
    cmsys::Glob globIt;
--- 177,183 ----
      }
    // if it is not found yet or not a framework header, then do a glob search
!   // for all frameworks in the directory: dir/*.framework/Headers/<file>
    cmStdString glob = dir;
!   glob += "*.framework/Headers/";
    glob += file;
    cmsys::Glob globIt;



More information about the Cmake-commits mailing list