[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6892-gc5c24c3

[Stephen Kelly]

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  c5c24c3bdf85ecf596cae62c2809da7d24a4d9ff (commit)
       via  05ce2a962ce27c0655959f0f92b1e891d125cea2 (commit)
      from  de61d9552476eae318bb97fc87ed1f3628d5425b (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=c5c24c3bdf85ecf596cae62c2809da7d24a4d9ff
commit c5c24c3bdf85ecf596cae62c2809da7d24a4d9ff
Merge: de61d95 05ce2a9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Jan 8 17:26:03 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 8 17:26:03 2014 -0500

    Merge topic 'minor-cleanups' into next
    
    05ce2a9 Windows fixes.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=05ce2a962ce27c0655959f0f92b1e891d125cea2
commit 05ce2a962ce27c0655959f0f92b1e891d125cea2
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Jan 8 23:25:28 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Jan 8 23:25:28 2014 +0100

    Windows fixes.

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 30fcce7..46ab383 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -816,8 +816,6 @@ void cmVisualStudio10TargetGenerator::WriteGroups()
     this->WriteString("</Filter>\n", 2);
     }
 
-  std::vector<cmSourceFile*> resxObjs;
-  this->GeneratorTarget->GetResxSources(resxObjs);
   if(!resxObjs.empty())
     {
     this->WriteString("<Filter Include=\"Resource Files\">\n", 2);
@@ -1049,12 +1047,12 @@ void cmVisualStudio10TargetGenerator::WriteAllSources()
       }
     }
 
+  std::vector<cmSourceFile*> externalObjects;
+  this->GeneratorTarget->GetExternalObjects(externalObjects);
   if(this->LocalGenerator->GetVersion() > cmLocalVisualStudioGenerator::VS10)
     {
     // For VS >= 11 we use LinkObjects to avoid linking custom command
     // outputs.  Use Object for all external objects, generated or not.
-    std::vector<cmSourceFile*> externalObjects;
-    this->GeneratorTarget->GetExternalObjects(externalObjects);
     this->WriteSources("Object", externalObjects);
     }
   else

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

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


hooks/post-receive
-- 
CMake