[Cmake-commits] CMake branch, next, updated. v3.2.2-2766-g07d66fe

[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  07d66feed56f99707914506ea25c29873864ae7e (commit)
       via  bf8006289d472aaf9404cba01c0935e4a1aa8ec9 (commit)
      from  00e2021be898b03f53de7308eebea4acb13f884d (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=07d66feed56f99707914506ea25c29873864ae7e
commit 07d66feed56f99707914506ea25c29873864ae7e
Merge: 00e2021 bf80062
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri May 15 16:03:05 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri May 15 16:03:05 2015 -0400

    Merge topic 'add-iwyu-support' into next
    
    bf800628 iwyu: whitespace fixups


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bf8006289d472aaf9404cba01c0935e4a1aa8ec9
commit bf8006289d472aaf9404cba01c0935e4a1aa8ec9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri May 15 16:02:36 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri May 15 16:02:36 2015 -0400

    iwyu: whitespace fixups

diff --git a/Source/CTest/cmCTestLaunch.cxx b/Source/CTest/cmCTestLaunch.cxx
index ca39f19..de6ecde 100644
--- a/Source/CTest/cmCTestLaunch.cxx
+++ b/Source/CTest/cmCTestLaunch.cxx
@@ -649,6 +649,7 @@ void cmCTestLaunch::LoadScrapeRules()
   this->RegexWarning.push_back("(^|[ :])[Ww][Aa][Rr][Nn][Ii][Nn][Gg]");
   this->RegexWarning.push_back("(^|[ :])[Rr][Ee][Mm][Aa][Rr][Kk]");
   this->RegexWarning.push_back("(^|[ :])[Nn][Oo][Tt][Ee]");
+
   // Load custom match rules given to us by CTest.
   this->LoadScrapeRules("Warning", this->RegexWarning);
   this->LoadScrapeRules("WarningSuppress", this->RegexWarningSuppress);
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index 0683a3f..a205f2b 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -278,8 +278,8 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
       // capture stderr, look for strings
       // output Warning iwyu output:\n make sure matches regex
       // the return value of iwyu is ignored as it is always fail
-      if(!cmSystemTools::RunSingleCommand(orig_cmd, 0, &stdErr, &ret,
-                                          0, cmSystemTools::OUTPUT_PASSTHROUGH))
+      if(!cmSystemTools::RunSingleCommand(orig_cmd, 0, &stdErr, &ret, 0,
+                                          cmSystemTools::OUTPUT_PASSTHROUGH))
         {
         std::cerr << "Error running: " << orig_cmd[0] << "\n";
         std::cerr << stdErr << "\n";
@@ -774,6 +774,7 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
         return autogenSuccess ? 0 : 1;
       }
 #endif
+
     // Tar files
     else if (args[1] == "tar" && args.size() > 3)
       {

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

Summary of changes:
 Source/CTest/cmCTestLaunch.cxx |    1 +
 Source/cmcmd.cxx               |    5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake