[Cmake-commits] CMake branch, next, updated. v2.8.10-662-g567a280

[David Cole]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  567a280cdbcd323b3652fa0313367367f58b8c62 (commit)
       via  d7de6410dd462b2f83e77f78575b3f9112d154d0 (commit)
      from  2b4f3d8c8b8cf49e5c5d588188cf11075b363ca7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=567a280cdbcd323b3652fa0313367367f58b8c62
commit 567a280cdbcd323b3652fa0313367367f58b8c62
Merge: 2b4f3d8 d7de641
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Wed Oct 31 16:43:14 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 31 16:43:14 2012 -0400

    Merge topic 'fix-13571-avoid-empty-sln-folders' into next
    
    d7de641 VS: Avoid empty, unreferenced solution folders... (#13571)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d7de6410dd462b2f83e77f78575b3f9112d154d0
commit d7de6410dd462b2f83e77f78575b3f9112d154d0
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Wed Oct 24 14:27:06 2012 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Wed Oct 24 14:27:06 2012 -0400

    VS: Avoid empty, unreferenced solution folders... (#13571)
    
    ...in generated sub-directory sln files.
    
    Thanks to rlandert for the bug report and proposed patch.
    
    The method WriteTargetsToSolution gets called possibly multiple times,
    once per sln file, (-> once per "project" command).
    
    Before accumulating folder names in VisualStudioFolders, clear it
    first, so it doesn't have stale entries in it from the previous
    sln file.

diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index b6eea5d..15ef738 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -268,6 +268,8 @@ void cmGlobalVisualStudio7Generator::WriteTargetsToSolution(
     cmLocalGenerator* root,
     OrderedTargetDependSet const& projectTargets)
 {
+  VisualStudioFolders.clear();
+
   for(OrderedTargetDependSet::const_iterator tt =
         projectTargets.begin(); tt != projectTargets.end(); ++tt)
     {

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalVisualStudio7Generator.cxx |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake