[Cmake-commits] CMake branch, next, updated. v2.8.2-913-g8db9c4a

[Ben Boeckel]

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  8db9c4a8c0ccdb91cabbe3311640784fa3999b45 (commit)
       via  fe56002a167df5d5c28de9e5a5c0b4bb1660fccf (commit)
      from  3c3d578d7a05df228f7e22e710e9591bbacb2f04 (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=8db9c4a8c0ccdb91cabbe3311640784fa3999b45
commit 8db9c4a8c0ccdb91cabbe3311640784fa3999b45
Merge: 3c3d578 fe56002
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Thu Sep 23 10:16:08 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 23 10:16:08 2010 -0400

    Merge topic 'dev/strict-mode' into next
    
    fe56002 Fix long lines for KWStyle


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fe56002a167df5d5c28de9e5a5c0b4bb1660fccf
commit fe56002a167df5d5c28de9e5a5c0b4bb1660fccf
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Thu Sep 23 10:14:37 2010 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Thu Sep 23 10:14:37 2010 -0400

    Fix long lines for KWStyle

diff --git a/Source/cmCommandArgumentParserHelper.cxx b/Source/cmCommandArgumentParserHelper.cxx
index 3f1ba53..23101b8 100644
--- a/Source/cmCommandArgumentParserHelper.cxx
+++ b/Source/cmCommandArgumentParserHelper.cxx
@@ -134,7 +134,7 @@ char* cmCommandArgumentParserHelper::ExpandVariable(const char* var)
           cmSystemTools::IsSubDirectory(this->FileName,
                                         this->Makefile->GetHomeDirectory()) ||
           cmSystemTools::IsSubDirectory(this->FileName,
-                                        this->Makefile->GetHomeOutputDirectory()))
+                                     this->Makefile->GetHomeOutputDirectory()))
         {
         cmOStringStream msg;
         msg << this->FileName << ":" << this->FileLine << ":" <<
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index cb68f22..07abc8e 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -4499,12 +4499,13 @@ void cmake::RunCheckForUnusedVariables() const
     if(this->WarnUnusedCli)
       {
       std::map<std::string, bool>::const_iterator it;
-      for(it = this->UsedCliVariables.begin(); it != this->UsedCliVariables.end(); ++it)
+      for(it = this->UsedCliVariables.begin();
+          it != this->UsedCliVariables.end(); ++it)
         {
         if(!it->second)
           {
-          std::string message = "warning: The variable, '" + it->first + "', given "
-            "on the command line, was not used within the build.";
+          std::string message = "warning: The variable, '" + it->first +
+            "', given on the command line, was not used within the build.";
           cmSystemTools::Message(message.c_str());
           }
         }

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

Summary of changes:
 Source/cmCommandArgumentParserHelper.cxx |    2 +-
 Source/cmake.cxx                         |    7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake