[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-582-g168acad

[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  168acad48d395ba3e138bbd9962927120069ad3e (commit)
       via  7450bd4f6b3b186cd56e6f1b38c6da6eea3a6652 (commit)
       via  bc3926bb42c3ee1718892edfefcaa81d1e51b7ad (commit)
      from  8709f887f1565054381b8eed3c525f5192dc244b (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=168acad48d395ba3e138bbd9962927120069ad3e
commit 168acad48d395ba3e138bbd9962927120069ad3e
Merge: 8709f88 7450bd4
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 15 16:37:20 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 15 16:37:20 2015 -0400

    Merge topic 'genex-consumers-generator-targets' into next
    
    7450bd4f fixup! Genex: Port some access API to cmGeneratorTarget.
    bc3926bb fixup! Genex: Port implementation to cmGeneratorTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7450bd4f6b3b186cd56e6f1b38c6da6eea3a6652
commit 7450bd4f6b3b186cd56e6f1b38c6da6eea3a6652
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 15 22:36:50 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 15 22:36:50 2015 +0200

    fixup! Genex: Port some access API to cmGeneratorTarget.

diff --git a/Source/cmExportTryCompileFileGenerator.cxx b/Source/cmExportTryCompileFileGenerator.cxx
index e0fd1a5..fe5717a 100644
--- a/Source/cmExportTryCompileFileGenerator.cxx
+++ b/Source/cmExportTryCompileFileGenerator.cxx
@@ -84,9 +84,10 @@ std::string cmExportTryCompileFileGenerator::FindTargets(
                                      false, &gDummyHead,
                                      gtgt, &dagChecker);
 
-  const std::set<cmGeneratorTarget const*> &allTargets = cge->GetAllTargetsSeen();
-  for(std::set<cmGeneratorTarget const*>::const_iterator li = allTargets.begin();
-      li != allTargets.end(); ++li)
+  const std::set<cmGeneratorTarget const*> &allTargets =
+      cge->GetAllTargetsSeen();
+  for(std::set<cmGeneratorTarget const*>::const_iterator li =
+      allTargets.begin(); li != allTargets.end(); ++li)
     {
     if(emitted.insert((*li)->Target).second)
       {
diff --git a/Source/cmGeneratorExpression.h b/Source/cmGeneratorExpression.h
index a1bd042..efd381b 100644
--- a/Source/cmGeneratorExpression.h
+++ b/Source/cmGeneratorExpression.h
@@ -152,8 +152,8 @@ private:
   mutable std::set<cmGeneratorTarget*> DependTargets;
   mutable std::set<cmGeneratorTarget const*> AllTargetsSeen;
   mutable std::set<std::string> SeenTargetProperties;
-  mutable std::map<cmGeneratorTarget const*, std::map<std::string, std::string> >
-                                                          MaxLanguageStandard;
+  mutable std::map<cmGeneratorTarget const*,
+                   std::map<std::string, std::string> > MaxLanguageStandard;
   mutable std::string Output;
   mutable bool HadContextSensitiveCondition;
   mutable bool HadHeadSensitiveCondition;
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 44ad2a7..3afcb42 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -3029,7 +3029,7 @@ std::string cmGlobalGenerator::EscapeJSON(const std::string& s) {
 
 //----------------------------------------------------------------------------
 void cmGlobalGenerator::SetFilenameTargetDepends(cmSourceFile* sf,
-                                              std::set<cmGeneratorTarget const*> tgts)
+                                     std::set<cmGeneratorTarget const*> tgts)
 {
   this->FilenameTargetDepends[sf] = tgts;
 }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bc3926bb42c3ee1718892edfefcaa81d1e51b7ad
commit bc3926bb42c3ee1718892edfefcaa81d1e51b7ad
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 15 22:34:13 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 15 22:34:13 2015 +0200

    fixup! Genex: Port implementation to cmGeneratorTarget.

diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index a38da77..8521a15 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -1107,7 +1107,8 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
         }
       }
 #undef POPULATE_INTERFACE_PROPERTY_NAME
-    cmGeneratorTarget const* headTarget = context->HeadTarget && isInterfaceProperty
+    cmGeneratorTarget const* headTarget =
+        context->HeadTarget && isInterfaceProperty
                                ? context->HeadTarget : target;
 
     if(isInterfaceProperty)

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

Summary of changes:
 Source/cmExportTryCompileFileGenerator.cxx |    7 ++++---
 Source/cmGeneratorExpression.h             |    4 ++--
 Source/cmGeneratorExpressionNode.cxx       |    3 ++-
 Source/cmGlobalGenerator.cxx               |    2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake