[Cmake-commits] [cmake-commits] king committed cmOrderDirectories.cxx 1.8 1.9 cmOrderDirectories.h 1.3 1.4

[cmake-commits at cmake.org]

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

Modified Files:
	cmOrderDirectories.cxx cmOrderDirectories.h 
Log Message:
STYLE: Factor CollectOriginalDirectories code

This factors code out of cmOrderDirectories::CollectOriginalDirectories
into cmOrderDirectories::AddOriginalDirectories.  Later a new call will
be added, and this is more readable anyway.


Index: cmOrderDirectories.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmOrderDirectories.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -C 2 -d -r1.8 -r1.9
*** cmOrderDirectories.cxx	26 Dec 2008 18:28:20 -0000	1.8
--- cmOrderDirectories.cxx	14 Jul 2009 14:14:41 -0000	1.9
***************
*** 394,417 ****
    // indexed first so their original order is preserved as much as
    // possible subject to the constraints.
!   for(std::vector<std::string>::const_iterator
!         di = this->UserDirectories.begin();
!       di != this->UserDirectories.end(); ++di)
!     {
!     // We never explicitly specify implicit link directories.
!     if(this->ImplicitDirectories.find(*di) !=
!        this->ImplicitDirectories.end())
!       {
!       continue;
!       }
! 
!     // Skip the empty string.
!     if(di->empty())
!       {
!       continue;
!       }
! 
!     // Add this directory.
!     this->AddOriginalDirectory(*di);
!     }
  
    // Add directories containing constraints.
--- 394,398 ----
    // indexed first so their original order is preserved as much as
    // possible subject to the constraints.
!   this->AddOriginalDirectories(this->UserDirectories);
  
    // Add directories containing constraints.
***************
*** 440,443 ****
--- 421,450 ----
  
  //----------------------------------------------------------------------------
+ void
+ cmOrderDirectories
+ ::AddOriginalDirectories(std::vector<std::string> const& dirs)
+ {
+   for(std::vector<std::string>::const_iterator di = dirs.begin();
+       di != dirs.end(); ++di)
+     {
+     // We never explicitly specify implicit link directories.
+     if(this->ImplicitDirectories.find(*di) !=
+        this->ImplicitDirectories.end())
+       {
+       continue;
+       }
+ 
+     // Skip the empty string.
+     if(di->empty())
+       {
+       continue;
+       }
+ 
+     // Add this directory.
+     this->AddOriginalDirectory(*di);
+     }
+ }
+ 
+ //----------------------------------------------------------------------------
  struct cmOrderDirectoriesCompare
  {

Index: cmOrderDirectories.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmOrderDirectories.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** cmOrderDirectories.h	29 Jul 2008 18:57:00 -0000	1.3
--- cmOrderDirectories.h	14 Jul 2009 14:14:41 -0000	1.4
***************
*** 67,70 ****
--- 67,71 ----
    void CollectOriginalDirectories();
    int AddOriginalDirectory(std::string const& dir);
+   void AddOriginalDirectories(std::vector<std::string> const& dirs);
    void FindConflicts();
    void FindImplicitConflicts();