[Cmake-commits] CMake branch, next, updated. v2.8.4-1590-g6f70675

[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  6f706757d6f3c429d099452ac695ba66d98b23d1 (commit)
       via  a6b52bd8ef82d015231b426ac2d0a1e84ee3a823 (commit)
      from  89f8947caae0920b39798aeb3164e4f889e24465 (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=6f706757d6f3c429d099452ac695ba66d98b23d1
commit 6f706757d6f3c429d099452ac695ba66d98b23d1
Merge: 89f8947 a6b52bd
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Mon May 23 18:03:22 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon May 23 18:03:22 2011 -0400

    Merge topic 'fix-11925-vcxproj-filters-mismatch' into next
    
    a6b52bd VS10: Write header-only files in correct xml element (#11925)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a6b52bd8ef82d015231b426ac2d0a1e84ee3a823
commit a6b52bd8ef82d015231b426ac2d0a1e84ee3a823
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Mon May 23 17:30:23 2011 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Mon May 23 17:30:23 2011 -0400

    VS10: Write header-only files in correct xml element (#11925)

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index b8fef25..6d2338e 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -455,7 +455,11 @@ void cmVisualStudio10TargetGenerator::WriteGroups()
       {
       lang = "None";
       }
-    if(lang[0] == 'C')
+    if(header)
+      {
+      headers.push_back(sf);
+      }
+    else if(lang[0] == 'C')
       {
       clCompile.push_back(sf);
       }
@@ -467,10 +471,6 @@ void cmVisualStudio10TargetGenerator::WriteGroups()
       {
       customBuild.push_back(sf);
       }
-    else if(header)
-      {
-      headers.push_back(sf);
-      }
     else if(ext == "idl")
       {
       idls.push_back(sf);

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

Summary of changes:
 Source/cmVisualStudio10TargetGenerator.cxx |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake