[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-743-ga3de829

[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  a3de829edbb478a949ae9877e6a1541657869305 (commit)
       via  0f185d838e86a536c2c9200dcb82e735316d6728 (commit)
      from  1bc5bbf165a5d818d9589d5b6599727af47afaa3 (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=a3de829edbb478a949ae9877e6a1541657869305
commit a3de829edbb478a949ae9877e6a1541657869305
Merge: 1bc5bbf 0f185d8
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 20 18:43:14 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 20 18:43:14 2015 -0400

    Merge topic 'inline-cmMakeDepend-content' into next
    
    0f185d83 fixup! cmMakeDepend: Inline into inheriting class.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0f185d838e86a536c2c9200dcb82e735316d6728
commit 0f185d838e86a536c2c9200dcb82e735316d6728
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 00:42:54 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 00:42:54 2015 +0200

    fixup! cmMakeDepend: Inline into inheriting class.

diff --git a/Source/cmOutputRequiredFilesCommand.cxx b/Source/cmOutputRequiredFilesCommand.cxx
index 59dafba..54208ac 100644
--- a/Source/cmOutputRequiredFilesCommand.cxx
+++ b/Source/cmOutputRequiredFilesCommand.cxx
@@ -210,7 +210,8 @@ protected:
           qend = currentline.find('\"', qstart+1);
           }
         // extract the file being included
-        std::string includeFile = currentline.substr(qstart+1, qend - qstart-1);
+        std::string includeFile =
+          currentline.substr(qstart+1, qend - qstart-1);
         // see if the include matches the regular expression
         if(!this->IncludeFileRegularExpression.find(includeFile))
           {
@@ -507,7 +508,8 @@ protected:
       return fp;
       }
 
-    for(std::vector<std::string>::iterator i = this->IncludeDirectories.begin();
+    for(std::vector<std::string>::iterator i =
+        this->IncludeDirectories.begin();
         i != this->IncludeDirectories.end(); ++i)
       {
       std::string path = *i;

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

Summary of changes:
 Source/cmOutputRequiredFilesCommand.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake