[Cmake-commits] CMake branch, next, updated. v3.3.0-1731-g7a9a050

Stephen Kelly steveire at gmail.com
Sat Aug 1 05:35:49 EDT 2015


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  7a9a0505fe3d187de146baa5bf7fa513376c8427 (commit)
       via  2879cd92a5eb965e03302eec44e212a4198c94bd (commit)
      from  245e10c1674df5d8a7a0adce2660f1e934455a93 (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=7a9a0505fe3d187de146baa5bf7fa513376c8427
commit 7a9a0505fe3d187de146baa5bf7fa513376c8427
Merge: 245e10c 2879cd9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Aug 1 05:35:48 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Aug 1 05:35:48 2015 -0400

    Merge topic 'use-generator-target' into next
    
    2879cd92 fixup! cmGlobalGenerator: Base exclusion computation on cmGeneratorTarget.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2879cd92a5eb965e03302eec44e212a4198c94bd
commit 2879cd92a5eb965e03302eec44e212a4198c94bd
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Aug 1 11:35:28 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Aug 1 11:35:28 2015 +0200

    fixup! cmGlobalGenerator: Base exclusion computation on cmGeneratorTarget.

diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index c3131c3..c06dfb3 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -112,7 +112,7 @@ bool cmGlobalVisualStudioGenerator::Compute()
           i != gen.end(); ++i)
         {
         cmGeneratorTargetsType targets =
-            lg->GetMakefile()->GetGeneratorTargets();
+            (*i)->GetMakefile()->GetGeneratorTargets();
         for(cmGeneratorTargetsType::iterator t = targets.begin();
             t != targets.end(); ++t)
           {

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

Summary of changes:
 Source/cmGlobalVisualStudioGenerator.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list