[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5475-g31837f3

[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  31837f35fdd0eccfd0e714143e8518b1a48c7b2d (commit)
       via  5c1c479e53cc5a22ae908a53e08dea249e632927 (commit)
      from  e870a655e801c05217a480f105cc44aba5c7f634 (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=31837f35fdd0eccfd0e714143e8518b1a48c7b2d
commit 31837f35fdd0eccfd0e714143e8518b1a48c7b2d
Merge: e870a65 5c1c479
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Nov 19 17:23:32 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 19 17:23:32 2013 -0500

    Merge topic 'use-generator-target' into next
    
    5c1c479 Fix line length.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5c1c479e53cc5a22ae908a53e08dea249e632927
commit 5c1c479e53cc5a22ae908a53e08dea249e632927
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Nov 19 23:23:06 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Nov 19 23:23:06 2013 +0100

    Fix line length.

diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index dd06242..cac4eef 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -490,7 +490,8 @@ cmGlobalUnixMakefileGenerator3
       // Add this to the list of depends rules in this directory.
       if((!check_all || !l->second->GetPropertyAsBool("EXCLUDE_FROM_ALL")) &&
          (!check_relink ||
-          l->second->Target->NeedRelinkBeforeInstall(lg->ConfigurationName.c_str())))
+          l->second->Target
+                   ->NeedRelinkBeforeInstall(lg->ConfigurationName.c_str())))
         {
         std::string tname = lg->GetRelativeTargetDirectory(*l->second->Target);
         tname += "/";
@@ -638,7 +639,8 @@ cmGlobalUnixMakefileGenerator3
       (this->LocalGenerators[i]);
     // for each target Generate the rule files for each target.
     cmGeneratorTargetsType targets = lg->GetMakefile()->GetGeneratorTargets();
-    for(cmGeneratorTargetsType::iterator t = targets.begin(); t != targets.end(); ++t)
+    for(cmGeneratorTargetsType::iterator t = targets.begin();
+        t != targets.end(); ++t)
       {
       if(t->second->Target->IsImported())
         {
@@ -683,7 +685,8 @@ cmGlobalUnixMakefileGenerator3
           continue;
           }
         // Add a fast rule to build the target
-        std::string localName = lg->GetRelativeTargetDirectory(*t->second->Target);
+        std::string localName =
+                          lg->GetRelativeTargetDirectory(*t->second->Target);
         std::string makefileName;
         makefileName = localName;
         makefileName += "/build.make";
@@ -700,7 +703,8 @@ cmGlobalUnixMakefileGenerator3
 
         // Add a local name for the rule to relink the target before
         // installation.
-        if(t->second->Target->NeedRelinkBeforeInstall(lg->ConfigurationName.c_str()))
+        if(t->second->Target
+                    ->NeedRelinkBeforeInstall(lg->ConfigurationName.c_str()))
           {
           makeTargetName = lg->GetRelativeTargetDirectory(*t->second->Target);
           makeTargetName += "/preinstall";
@@ -739,7 +743,8 @@ cmGlobalUnixMakefileGenerator3
 
   // for each target Generate the rule files for each target.
   cmGeneratorTargetsType targets = lg->GetMakefile()->GetGeneratorTargets();
-  for(cmGeneratorTargetsType::iterator t = targets.begin(); t != targets.end(); ++t)
+  for(cmGeneratorTargetsType::iterator t = targets.begin();
+      t != targets.end(); ++t)
     {
     if(t->second->Target->IsImported())
       {
@@ -888,7 +893,8 @@ cmGlobalUnixMakefileGenerator3
                         t->second->GetName(), depends, commands, true);
 
       // Add rules to prepare the target for installation.
-      if(t->second->Target->NeedRelinkBeforeInstall(lg->ConfigurationName.c_str()))
+      if(t->second->Target
+                  ->NeedRelinkBeforeInstall(lg->ConfigurationName.c_str()))
         {
         localName = lg->GetRelativeTargetDirectory(*t->second->Target);
         localName += "/preinstall";
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index fa20f3e..943a866 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -148,7 +148,8 @@ void cmLocalUnixMakefileGenerator3::Generate()
   cmGeneratorTargetsType targets = this->Makefile->GetGeneratorTargets();
   cmGlobalUnixMakefileGenerator3* gg =
     static_cast<cmGlobalUnixMakefileGenerator3*>(this->GlobalGenerator);
-  for(cmGeneratorTargetsType::iterator t = targets.begin(); t != targets.end(); ++t)
+  for(cmGeneratorTargetsType::iterator t = targets.begin();
+      t != targets.end(); ++t)
     {
       if (t->first->IsImported())
         continue;
@@ -376,7 +377,8 @@ void cmLocalUnixMakefileGenerator3
   // on the target
   cmGeneratorTargetsType targets = this->Makefile->GetGeneratorTargets();
   std::string localName;
-  for(cmGeneratorTargetsType::iterator t = targets.begin(); t != targets.end(); ++t)
+  for(cmGeneratorTargetsType::iterator t = targets.begin();
+      t != targets.end(); ++t)
     {
     if((t->second->GetType() == cmTarget::EXECUTABLE) ||
        (t->second->GetType() == cmTarget::STATIC_LIBRARY) ||
@@ -415,7 +417,8 @@ void cmLocalUnixMakefileGenerator3
         }
 
       // Add a fast rule to build the target
-      std::string makefileName = this->GetRelativeTargetDirectory(*t->second->Target);
+      std::string makefileName =
+                         this->GetRelativeTargetDirectory(*t->second->Target);
       makefileName += "/build.make";
       // make sure the makefile name is suitable for a makefile
       std::string makeTargetName =
@@ -435,7 +438,8 @@ void cmLocalUnixMakefileGenerator3
 
       // Add a local name for the rule to relink the target before
       // installation.
-      if(t->second->Target->NeedRelinkBeforeInstall(this->ConfigurationName.c_str()))
+      if(t->second->Target
+                  ->NeedRelinkBeforeInstall(this->ConfigurationName.c_str()))
         {
         makeTargetName = this->GetRelativeTargetDirectory(*t->second->Target);
         makeTargetName += "/preinstall";

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

Summary of changes:
 Source/cmGlobalUnixMakefileGenerator3.cxx |   18 ++++++++++++------
 Source/cmLocalUnixMakefileGenerator3.cxx  |   12 ++++++++----
 2 files changed, 20 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
CMake