[Cmake-commits] [cmake-commits] king committed cmGlobalVisualStudio7Generator.cxx 1.109 1.110 cmGlobalVisualStudio7Generator.h 1.52 1.53 cmGlobalVisualStudioGenerator.cxx 1.18 1.19 cmGlobalVisualStudioGenerator.h 1.12 1.13

[cmake-commits at cmake.org]

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

Modified Files:
	cmGlobalVisualStudio7Generator.cxx 
	cmGlobalVisualStudio7Generator.h 
	cmGlobalVisualStudioGenerator.cxx 
	cmGlobalVisualStudioGenerator.h 
Log Message:
Move OrderedTargetDependSet into VS superclass

We move cmGlobalVisualStudio7Generator::OrderedTargetDependSet up to
cmGlobalVisualStudioGenerator so it can be re-used for other VS
versions.  See issue #9568.


Index: cmGlobalVisualStudioGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudioGenerator.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C 2 -d -r1.12 -r1.13
*** cmGlobalVisualStudioGenerator.h	28 Sep 2009 15:42:41 -0000	1.12
--- cmGlobalVisualStudioGenerator.h	30 Sep 2009 20:02:58 -0000	1.13
***************
*** 75,78 ****
--- 75,89 ----
  
    virtual const char* GetIDEVersion() = 0;
+ 
+   struct TargetCompare
+   {
+     bool operator()(cmTarget const* l, cmTarget const* r) const;
+   };
+   class OrderedTargetDependSet: public std::multiset<cmTarget*, TargetCompare>
+   {
+   public:
+     OrderedTargetDependSet(cmGlobalGenerator::TargetDependSet const&);
+   };
+ 
  private:
    void FixUtilityDependsForTarget(cmTarget& target);

Index: cmGlobalVisualStudio7Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio7Generator.cxx,v
retrieving revision 1.109
retrieving revision 1.110
diff -C 2 -d -r1.109 -r1.110
*** cmGlobalVisualStudio7Generator.cxx	28 Sep 2009 15:42:41 -0000	1.109
--- cmGlobalVisualStudio7Generator.cxx	30 Sep 2009 20:02:58 -0000	1.110
***************
*** 660,691 ****
  
  //----------------------------------------------------------------------------
- bool
- cmGlobalVisualStudio7Generator::TargetCompare
- ::operator()(cmTarget const* l, cmTarget const* r)
- {
-   // Make sure ALL_BUILD is first so it is the default active project.
-   if(strcmp(r->GetName(), "ALL_BUILD") == 0)
-     {
-     return false;
-     }
-   if(strcmp(l->GetName(), "ALL_BUILD") == 0)
-     {
-     return true;
-     }
-   return strcmp(l->GetName(), r->GetName()) < 0;
- }
- 
- //----------------------------------------------------------------------------
- cmGlobalVisualStudio7Generator::OrderedTargetDependSet
- ::OrderedTargetDependSet(cmGlobalGenerator::TargetDependSet const& targets)
- {
-   for(cmGlobalGenerator::TargetDependSet::const_iterator ti =
-         targets.begin(); ti != targets.end(); ++ti)
-     {
-     this->insert(*ti);
-     }
- }
- 
- //----------------------------------------------------------------------------
  static cmVS7FlagTable cmVS7ExtraFlagTable[] =
  {
--- 660,663 ----

Index: cmGlobalVisualStudioGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudioGenerator.cxx,v
retrieving revision 1.18
retrieving revision 1.19
diff -C 2 -d -r1.18 -r1.19
*** cmGlobalVisualStudioGenerator.cxx	28 Sep 2009 15:42:41 -0000	1.18
--- cmGlobalVisualStudioGenerator.cxx	30 Sep 2009 20:02:58 -0000	1.19
***************
*** 727,728 ****
--- 727,756 ----
    return false;
  }
+ 
+ //----------------------------------------------------------------------------
+ bool
+ cmGlobalVisualStudioGenerator::TargetCompare
+ ::operator()(cmTarget const* l, cmTarget const* r) const
+ {
+   // Make sure ALL_BUILD is first so it is the default active project.
+   if(strcmp(r->GetName(), "ALL_BUILD") == 0)
+     {
+     return false;
+     }
+   if(strcmp(l->GetName(), "ALL_BUILD") == 0)
+     {
+     return true;
+     }
+   return strcmp(l->GetName(), r->GetName()) < 0;
+ }
+ 
+ //----------------------------------------------------------------------------
+ cmGlobalVisualStudioGenerator::OrderedTargetDependSet
+ ::OrderedTargetDependSet(cmGlobalGenerator::TargetDependSet const& targets)
+ {
+   for(cmGlobalGenerator::TargetDependSet::const_iterator ti =
+         targets.begin(); ti != targets.end(); ++ti)
+     {
+     this->insert(*ti);
+     }
+ }

Index: cmGlobalVisualStudio7Generator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio7Generator.h,v
retrieving revision 1.52
retrieving revision 1.53
diff -C 2 -d -r1.52 -r1.53
*** cmGlobalVisualStudio7Generator.h	28 Sep 2009 15:42:41 -0000	1.52
--- cmGlobalVisualStudio7Generator.h	30 Sep 2009 20:02:58 -0000	1.53
***************
*** 93,101 ****
    virtual const char* GetCMakeCFGInitDirectory()  { return "$(OutDir)"; }
  
-   struct TargetCompare
-   {
-     bool operator()(cmTarget const* l, cmTarget const* r);
-   };
- 
  protected:
    virtual const char* GetIDEVersion() { return "7.0"; }
--- 93,96 ----
***************
*** 117,126 ****
    virtual void AddPlatformDefinitions(cmMakefile* mf);
  
-   class OrderedTargetDependSet: public std::multiset<cmTarget*, TargetCompare>
-   {
-   public:
-     OrderedTargetDependSet(cmGlobalGenerator::TargetDependSet const&);
-   };
- 
    virtual void WriteTargetsToSolution(
      std::ostream& fout,
--- 112,115 ----