[Cmake-commits] CMake branch, next, updated. v2.8.3-1158-gf3d1d7e

[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  f3d1d7e4a9fed74521e8ec14371e9466e731db6b (commit)
       via  75a522110d3e142d4c549a072aa3b1b8792cd865 (commit)
      from  27920f2ff7f657fb01e0b9c7164e95c1e982b643 (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=f3d1d7e4a9fed74521e8ec14371e9466e731db6b
commit f3d1d7e4a9fed74521e8ec14371e9466e731db6b
Merge: 27920f2 75a5221
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 4 08:10:35 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 4 08:10:35 2011 -0500

    Merge topic 'include-command-whitespace' into next
    
    75a5221 Remove trailing whitespace


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=75a522110d3e142d4c549a072aa3b1b8792cd865
commit 75a522110d3e142d4c549a072aa3b1b8792cd865
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Tue Dec 14 22:25:21 2010 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 4 07:59:24 2011 -0500

    Remove trailing whitespace

diff --git a/Source/cmIncludeCommand.cxx b/Source/cmIncludeCommand.cxx
index c9b14a1..0ac6df4 100644
--- a/Source/cmIncludeCommand.cxx
+++ b/Source/cmIncludeCommand.cxx
@@ -26,10 +26,10 @@ bool cmIncludeCommand
   bool noPolicyScope = false;
   std::string fname = args[0];
   std::string resultVarName;
-  
+
   for (unsigned int i=1; i<args.size(); i++)
     {
-    if (args[i] == "OPTIONAL") 
+    if (args[i] == "OPTIONAL")
       {
       if (optional)
         {
@@ -60,10 +60,10 @@ bool cmIncludeCommand
       {
       noPolicyScope = true;
       }
-      else if(i > 1)  // compat.: in previous cmake versions the second 
+      else if(i > 1)  // compat.: in previous cmake versions the second
                       // parameter was ignore if it wasn't "OPTIONAL"
         {
-        std::string errorText = "called with invalid argument: ";  
+        std::string errorText = "called with invalid argument: ";
         errorText += args[i];
         this->SetError(errorText.c_str());
         return false;
@@ -82,15 +82,15 @@ bool cmIncludeCommand
       }
     }
   std::string fullFilePath;
-  bool readit = 
-    this->Makefile->ReadListFile( this->Makefile->GetCurrentListFile(), 
+  bool readit =
+    this->Makefile->ReadListFile( this->Makefile->GetCurrentListFile(),
                                   fname.c_str(), &fullFilePath,
                                   noPolicyScope);
-  
+
   // add the location of the included file if a result variable was given
   if (resultVarName.size())
     {
-      this->Makefile->AddDefinition(resultVarName.c_str(), 
+      this->Makefile->AddDefinition(resultVarName.c_str(),
                                     readit?fullFilePath.c_str():"NOTFOUND");
     }
 
diff --git a/Source/cmIncludeCommand.h b/Source/cmIncludeCommand.h
index a215275..8704750 100644
--- a/Source/cmIncludeCommand.h
+++ b/Source/cmIncludeCommand.h
@@ -15,7 +15,7 @@
 #include "cmCommand.h"
 
 /** \class cmIncludeCommand
- * \brief 
+ * \brief
  *
  *  cmIncludeCommand defines a list of distant
  *  files that can be "included" in the current list file.
@@ -28,7 +28,7 @@ public:
   /**
    * This is a virtual constructor for the command.
    */
-  virtual cmCommand* Clone() 
+  virtual cmCommand* Clone()
     {
     return new cmIncludeCommand;
     }
@@ -49,15 +49,15 @@ public:
    * The name of the command as specified in CMakeList.txt.
    */
   virtual const char* GetName() {return "include";}
-  
+
   /**
    * Succinct documentation.
    */
-  virtual const char* GetTerseDocumentation() 
+  virtual const char* GetTerseDocumentation()
     {
     return "Read CMake listfile code from the given file.";
     }
-  
+
   /**
    * More documentation.
    */
@@ -79,7 +79,7 @@ public:
       "NO_POLICY_SCOPE option."
       ;
     }
-  
+
   cmTypeMacro(cmIncludeCommand, cmCommand);
 };
 

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

Summary of changes:


hooks/post-receive
-- 
CMake