[Cmake-commits] [cmake-commits] king committed cmGlobalVisualStudio7Generator.cxx 1.104 1.105

[cmake-commits at cmake.org]

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

Modified Files:
	cmGlobalVisualStudio7Generator.cxx 
Log Message:
BUG: Fix ALL_BUILD ordering enforcement

The previous change to make ALL_BUILD come first among targets did not
account for comparing the target name against itself.  This led to an
invalid ordering of the target set.  This change fixes it.


Index: cmGlobalVisualStudio7Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio7Generator.cxx,v
retrieving revision 1.104
retrieving revision 1.105
diff -C 2 -d -r1.104 -r1.105
*** cmGlobalVisualStudio7Generator.cxx	21 Jan 2009 22:06:57 -0000	1.104
--- cmGlobalVisualStudio7Generator.cxx	21 Jan 2009 22:24:54 -0000	1.105
***************
*** 731,742 ****
  {
    // Make sure ALL_BUILD is first so it is the default active project.
-   if(strcmp(l->GetName(), "ALL_BUILD") == 0)
-     {
-     return true;
-     }
    if(strcmp(r->GetName(), "ALL_BUILD") == 0)
      {
      return false;
      }
    return strcmp(l->GetName(), r->GetName()) < 0;
  }
--- 731,742 ----
  {
    // 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;
  }