[Cmake-commits] CMake branch, next, updated. v2.8.9-820-gbf78717

[Brad King]

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  bf78717374f6533b289c5e2930799d47933da75b (commit)
       via  168fda7e63e1c7b9f703e279c87078b50522b01b (commit)
      from  0ce6f269cc717aec242253be45fcdf8bb784cb16 (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=bf78717374f6533b289c5e2930799d47933da75b
commit bf78717374f6533b289c5e2930799d47933da75b
Merge: 0ce6f26 168fda7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 28 10:57:20 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 28 10:57:20 2012 -0400

    Merge topic 'ninja-LIBPATH' into next
    
    168fda7 Ninja: Fix line-too-long style introduced by parent commits


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=168fda7e63e1c7b9f703e279c87078b50522b01b
commit 168fda7e63e1c7b9f703e279c87078b50522b01b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 28 10:55:42 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Sep 28 10:55:53 2012 -0400

    Ninja: Fix line-too-long style introduced by parent commits

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 0ce0a39..2b36ad0 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1537,7 +1537,8 @@ void cmLocalGenerator::GetTargetFlags(std::string& linkLibs,
           linkFlags += " ";
           }
         }
-      this->OutputLinkLibraries(linkLibs, frameworkPath, linkPath, *target, false);
+      this->OutputLinkLibraries(linkLibs, frameworkPath, linkPath,
+                                *target, false);
       }
       break;
     case cmTarget::EXECUTABLE:
@@ -1561,7 +1562,8 @@ void cmLocalGenerator::GetTargetFlags(std::string& linkLibs,
         return;
         }
       this->AddLanguageFlags(flags, linkLanguage, buildType.c_str());
-      this->OutputLinkLibraries(linkLibs, frameworkPath, linkPath, *target, false);
+      this->OutputLinkLibraries(linkLibs, frameworkPath, linkPath,
+                                *target, false);
       if(cmSystemTools::IsOn
          (this->Makefile->GetDefinition("BUILD_SHARED_LIBS")))
         {
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index ecbcda3..d39e7fa 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -547,8 +547,9 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
     {
     std::string frameworkPath;
     std::string linkPath;
-    this->LocalGenerator->OutputLinkLibraries(linkLibs, frameworkPath, linkPath,
-                                              *this->GeneratorTarget, relink);
+    this->LocalGenerator
+      ->OutputLinkLibraries(linkLibs, frameworkPath, linkPath,
+                            *this->GeneratorTarget, relink);
     linkLibs = frameworkPath + linkPath + linkLibs;
     }
 
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 1ce321e..9ed4b13 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -562,7 +562,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
     commandLineLengthLimit = 8000 - linkRuleLength;
 #elif defined(__linux) || defined(__APPLE__)
     // for instance ARG_MAX is 2096152 on Ubuntu or 262144 on Mac
-    commandLineLengthLimit = ((int)sysconf(_SC_ARG_MAX))- linkRuleLength - 1000;
+    commandLineLengthLimit = ((int)sysconf(_SC_ARG_MAX))-linkRuleLength-1000;
 #else
     commandLineLengthLimit = -1;
 #endif

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

Summary of changes:
 Source/cmLocalGenerator.cxx                 |    6 ++++--
 Source/cmMakefileLibraryTargetGenerator.cxx |    5 +++--
 Source/cmNinjaNormalTargetGenerator.cxx     |    2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake