--- cmake-2.6.4/Source/cmGlobalVisualStudio71Generator.cxx	2009-04-28 22:23:03.000000000 +0200
+++ cmake-2.6.4.eon/Source/cmGlobalVisualStudio71Generator.cxx	2009-05-04 16:22:59.000000000 +0200
@@ -118,6 +118,7 @@
   OrderedTargetDependSet orderedProjectTargets(projectTargets);
   this->WriteTargetsToSolution(fout, root, orderedProjectTargets,
                                originalTargets);
+  this->WriteFolders(fout);
   // Write out the configurations information for the solution
   fout << "Global\n";
   // Write out the configurations for the solution
@@ -127,6 +128,10 @@
   // Write out the configurations for all the targets in the project
   this->WriteTargetConfigurations(fout, root, orderedProjectTargets);
   fout << "\tEndGlobalSection\n";
+  // Write out project folders
+  fout << "\tGlobalSection(NestedProjects) = preSolution\n";
+  this->WriteFoldersContent(fout);
+  fout << "\tEndGlobalSection\n";
   // Write the footer for the SLN file
   this->WriteSLNFooter(fout);
 }
--- cmake-2.6.4/Source/cmGlobalVisualStudio7Generator.cxx	2009-04-28 22:23:03.000000000 +0200
+++ cmake-2.6.4.eon/Source/cmGlobalVisualStudio7Generator.cxx	2009-05-04 16:38:59.000000000 +0200
@@ -21,6 +21,37 @@
 #include "cmMakefile.h"
 #include "cmake.h"
 
+inline std::vector<std::string> tokenize(const std::string& str,
+                                         const std::string& sep)
+{
+  std::vector<std::string> tokens;
+  std::string::size_type tokend = 0;
+
+  do
+    {
+    std::string::size_type tokstart=str.find_first_not_of(sep, tokend);
+    if (tokstart==std::string::npos) 
+      {
+      break;    // no more tokens
+      }
+    tokend=str.find_first_of(sep,tokstart);
+    if (tokend==std::string::npos)
+      {
+      tokens.push_back(str.substr(tokstart));
+      }
+    else
+      {
+      tokens.push_back(str.substr(tokstart,tokend-tokstart));
+      }
+    } while (tokend!=std::string::npos);
+
+  if (tokens.empty())
+    {
+    tokens.push_back("");
+    }
+  return tokens;
+}
+
 cmGlobalVisualStudio7Generator::cmGlobalVisualStudio7Generator()
 {
   this->FindMakeProgramFile = "CMakeVS7FindMake.cmake";
@@ -353,7 +384,33 @@
                               cmLocalGenerator::START_OUTPUT);
           this->WriteProject(fout, vcprojName, dir.c_str(),
                              *target);
-          }
+		  const char * targetFolder = target->GetProperty("SOLUTION_FOLDER");
+		  if(targetFolder)
+            {
+			this->CreateGUID(targetFolder);
+			std::vector<std::string> tokens = tokenize(targetFolder,
+													   "\\");
+			std::string parent = targetFolder;
+			for(std::vector<std::string>::iterator iter = tokens.begin ();
+				iter != tokens.end ();
+				iter++)
+			{
+				if(!iter->size ())
+					continue;
+				this->CreateGUID(iter->c_str());
+				if(parent != targetFolder)
+				{
+					VisualStudioFolders[parent].push_back(*iter);
+				}
+				else
+				{
+					VisualStudioFolders[*iter].push_back("");
+				}
+				parent = *iter;
+			}
+		    VisualStudioFolders[parent].push_back(target->GetName());
+			}
+		  }
         }
       }
     }
@@ -429,6 +486,7 @@
   OrderedTargetDependSet orderedProjectTargets(projectTargets);
   this->WriteTargetsToSolution(fout, root, orderedProjectTargets,
                                originalTargets);
+  this->WriteFolders(fout);
   // Write out the configurations information for the solution
   fout << "Global\n"
        << "\tGlobalSection(SolutionConfiguration) = preSolution\n";
@@ -446,6 +504,11 @@
   this->WriteTargetDepends(fout, orderedProjectTargets);
   fout << "\tEndGlobalSection\n";
 
+  // Write out project folders
+  fout << "\tGlobalSection(NestedProjects) = preSolution\n";
+  this->WriteFoldersContent(fout);
+  fout << "\tEndGlobalSection\n";
+
   // Write out the configurations for all the targets in the project
   fout << "\tGlobalSection(ProjectConfiguration) = postSolution\n";
   this->WriteTargetConfigurations(fout, root, orderedProjectTargets);
@@ -724,6 +787,32 @@
   return true;
 }
 
+void cmGlobalVisualStudio7Generator::WriteFolders(std::ostream& fout)
+{
+	std::string guidFake = "2150E333-8FDC-42A3-9474-1A3956D46DE8"; // seems to be a magic value
+	for(std::map<std::string,std::vector<std::string> >::iterator iter = VisualStudioFolders.begin ();
+		iter != VisualStudioFolders.end ();
+		iter++)
+	{
+		std::string guid = this->GetGUID(iter->first.c_str());
+		fout << "Project(\"{" << guidFake << "}\") = \"" << iter->first << "\", \"" << iter->first << "\", \"{" << guid << "}\"\nEndProject\n";
+	}
+}
+
+void cmGlobalVisualStudio7Generator::WriteFoldersContent(std::ostream& fout)
+{
+	for(std::map<std::string,std::vector<std::string> >::iterator iter = VisualStudioFolders.begin ();
+		iter != VisualStudioFolders.end ();
+		iter++)
+	{
+		for(std::vector<std::string>::iterator it = iter->second.begin ();
+			it != iter->second.end ();
+			it++)
+			if (it->size ())
+				fout << "\t\t{" << this->GetGUID (it->c_str()) << "} = {" << this->GetGUID(iter->first.c_str()) << "}\n";
+	}
+}
+
 //----------------------------------------------------------------------------
 bool
 cmGlobalVisualStudio7Generator::TargetCompare
--- cmake-2.6.4/Source/cmGlobalVisualStudio7Generator.h	2009-04-28 22:23:03.000000000 +0200
+++ cmake-2.6.4.eon/Source/cmGlobalVisualStudio7Generator.h	2009-05-04 16:40:00.000000000 +0200
@@ -154,8 +154,13 @@
 
   bool IsPartOfDefaultBuild(const char* project,
                             cmTarget* target);
+  void WriteFoldersContent(std::ostream& fout);
+
+  void WriteFolders(std::ostream& fout);
+
   std::vector<std::string> Configurations;
   std::map<cmStdString, cmStdString> GUIDMap;
+  std::map<std::string,std::vector<std::string> > VisualStudioFolders;
 
   // Set during OutputSLNFile with the name of the current project.
   // There is one SLN file per project.

diff -ru cmake-2.8.0.orig/Source/cmGlobalVisualStudio8Generator.cxx cmake-2.8.0/Source/cmGlobalVisualStudio8Generator.cxx
--- cmake-2.8.0.orig/Source/cmGlobalVisualStudio8Generator.cxx	2009-11-13 12:58:00.000000000 -0800
+++ cmake-2.8.0/Source/cmGlobalVisualStudio8Generator.cxx	2009-12-18 18:52:31.401861400 -0800
@@ -258,6 +258,127 @@
   fout << "\tEndGlobalSection\n";
 }
 
+static std::vector<std::string> tokenize(const std::string& str,
+                                         const std::string& sep)
+{
+  std::vector<std::string> tokens;
+  std::string::size_type tokend = 0;
+
+  do
+    {
+    std::string::size_type tokstart=str.find_first_not_of(sep, tokend);
+    if (tokstart==std::string::npos) 
+      {
+      break;    // no more tokens
+      }
+    tokend=str.find_first_of(sep,tokstart);
+    if (tokend==std::string::npos)
+      {
+      tokens.push_back(str.substr(tokstart));
+      }
+    else
+      {
+      tokens.push_back(str.substr(tokstart,tokend-tokstart));
+      }
+    } while (tokend!=std::string::npos);
+
+  if (tokens.empty())
+    {
+    tokens.push_back("");
+    }
+  return tokens;
+}
+
+void cmGlobalVisualStudio8Generator::WriteTargetsToSolution(
+    std::ostream& fout,
+    cmLocalGenerator* root,
+    OrderedTargetDependSet const& projectTargets)
+{
+  cmGlobalVisualStudio71Generator::WriteTargetsToSolution(fout, root, projectTargets);
+
+  for(OrderedTargetDependSet::const_iterator tt =
+      projectTargets.begin(); tt != projectTargets.end(); ++tt)
+  {
+    cmTarget* target = *tt;
+    const char * projectgroup = target->GetProperty("PROJECT_GROUP");
+    bool use_automatic_projectgroup = (projectgroup) 
+      ? false 
+      : this->CMakeInstance->GetPropertyAsBool("AUTO_PROJECT_GROUPS");
+    if(use_automatic_projectgroup)
+    {
+      const char *pRoot = target->GetMakefile()->GetHomeDirectory();
+      const char *pPath = target->GetMakefile()->GetStartDirectory();
+
+      if(pRoot && pPath && (strstr(pPath, pRoot) == pPath))
+      {
+        projectgroup = pPath + strlen(pRoot);
+        if(*projectgroup == '/')
+          projectgroup++;
+      }
+    }
+    if(projectgroup && *projectgroup)
+    {
+      this->CreateGUID(projectgroup);
+      std::vector<std::string> tokens = tokenize(projectgroup, "/");
+
+      if(use_automatic_projectgroup)
+        tokens.pop_back(); // Use the name of the project instead of the dirname
+
+      std::string parent = projectgroup;
+      for(std::vector<std::string>::iterator iter = tokens.begin ();
+          iter != tokens.end ();
+          iter++)
+      {
+        if(!iter->size ())
+          continue;
+        this->CreateGUID(iter->c_str());
+        if(parent != projectgroup)
+        {
+          SolutionFolders[parent].push_back(*iter);
+        }
+        else
+        {
+          SolutionFolders[*iter].push_back("");
+        }
+        parent = *iter;
+      }
+      SolutionFolders[parent].push_back(target->GetName());
+    }
+  }
+
+  std::string guidFake = "2150E333-8FDC-42A3-9474-1A3956D46DE8"; // seems to be a magic value
+  for(std::map<std::string,std::vector<std::string> >::iterator iter = SolutionFolders.begin ();
+      iter != SolutionFolders.end ();
+      iter++)
+  {
+    std::string guid = this->GetGUID(iter->first.c_str());
+    fout << "Project(\"{" << guidFake << "}\") = \"" << iter->first << "\", \"" << iter->first << "\", \"{" << guid << "}\"\nEndProject\n";
+  }
+}
+
+void cmGlobalVisualStudio8Generator::WriteSLNFooter(std::ostream& fout)
+{
+  // Write out SolutionFolder heirarchy, if any are present
+  if(SolutionFolders.size() > 0)
+  {
+    fout << "\tGlobalSection(NestedProjects) = preSolution\n";
+    for(std::map<std::string,std::vector<std::string> >::iterator iter = SolutionFolders.begin ();
+        iter != SolutionFolders.end ();
+        iter++)
+    {
+      for(std::vector<std::string>::iterator it = iter->second.begin ();
+          it != iter->second.end ();
+          it++)
+        if (it->size ())
+          fout << "\t\t{" << this->GetGUID (it->c_str()) << "} = {" << this->GetGUID(iter->first.c_str()) << "}\n";
+    }
+    fout << "\tEndGlobalSection\n";
+  }
+  SolutionFolders.clear();
+
+  cmGlobalVisualStudio71Generator::WriteSLNFooter(fout);
+}
+
 //----------------------------------------------------------------------------
 void
 cmGlobalVisualStudio8Generator
diff -ru cmake-2.8.0.orig/Source/cmGlobalVisualStudio8Generator.h cmake-2.8.0/Source/cmGlobalVisualStudio8Generator.h
--- cmake-2.8.0.orig/Source/cmGlobalVisualStudio8Generator.h	2009-11-13 12:58:00.000000000 -0800
+++ cmake-2.8.0/Source/cmGlobalVisualStudio8Generator.h	2009-12-18 18:39:25.553861400 -0800
@@ -78,6 +78,12 @@
   virtual void WriteProjectConfigurations(std::ostream& fout,
                                           const char* name,
                                           bool partOfDefaultBuild);
+  virtual void WriteTargetsToSolution(
+    std::ostream& fout,
+    cmLocalGenerator* root,
+    OrderedTargetDependSet const& projectTargets);
+  virtual void WriteSLNFooter(std::ostream& fout);
   std::string PlatformName; // Win32 or x64 
+  std::map<std::string,std::vector<std::string> > SolutionFolders;
 };
 #endif