[Cmake-commits] CMake branch, next, updated. v2.8.8-3338-ge4f9a0c

[Peter Kuemmel]

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  e4f9a0cc08c38a07cf21662ecc455bcd058c3e1b (commit)
       via  24a35cef25a939a555360528e95c1f434c7ffc8b (commit)
      from  11db89a27de99758d69bdd8c027516c5485bf0e2 (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=e4f9a0cc08c38a07cf21662ecc455bcd058c3e1b
commit e4f9a0cc08c38a07cf21662ecc455bcd058c3e1b
Merge: 11db89a 24a35ce
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Thu Jun 28 07:49:19 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 28 07:49:19 2012 -0400

    Merge topic 'make_cldep_use_cmake_process_exec' into next
    
    24a35ce Ninja: print error message when command failed


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=24a35cef25a939a555360528e95c1f434c7ffc8b
commit 24a35cef25a939a555360528e95c1f434c7ffc8b
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Thu Jun 28 13:46:43 2012 +0200
Commit:     Peter Kuemmel <syntheticpp at gmx.net>
CommitDate: Thu Jun 28 13:48:10 2012 +0200

    Ninja: print error message when command failed

diff --git a/Source/cmcldeps.cxx b/Source/cmcldeps.cxx
index 39f696f..ce64132 100644
--- a/Source/cmcldeps.cxx
+++ b/Source/cmcldeps.cxx
@@ -178,11 +178,9 @@ static int process( const std::string& srcfilename,
                     bool quiet = false)
 {
   std::string output;
-  int ret = 0;
   // break up command line into a vector
   std::vector<std::string> args;
-  cmSystemTools::ParseWindowsCommandLine(cmd.c_str(),
-                                         args);
+  cmSystemTools::ParseWindowsCommandLine(cmd.c_str(), args);
   // convert to correct vector type for RunSingleCommand
   std::vector<cmStdString> command;
   for(std::vector<std::string>::iterator i = args.begin();
@@ -191,14 +189,10 @@ static int process( const std::string& srcfilename,
     command.push_back(i->c_str());
     }
   // run the command
-  bool success =
-    cmSystemTools::RunSingleCommand(command, &output, &ret, dir.c_str(),
-                                    cmSystemTools::OUTPUT_NONE);
-  if(ret!= 0)
-    {
-    return 2;
-    }
-  int exit_code = ret;
+  int exit_code = 0;
+  bool run = cmSystemTools::RunSingleCommand(command, &output, &exit_code,
+                                    dir.c_str(), cmSystemTools::OUTPUT_NONE);
+
   // process the include directives and output everything else
   std::stringstream ss(output);
   std::string line;
@@ -221,14 +215,11 @@ static int process( const std::string& srcfilename,
     }
   }
 
-  if (!success) {
-    return exit_code;
-  }
-
   // don't update .d until/unless we succeed compilation
-  outputDepFile(dfile, objfile, includes);
+  if (run && exit_code == 0)
+    outputDepFile(dfile, objfile, includes);
 
-  return 0;
+  return exit_code;
 }
 
 

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

Summary of changes:
 Source/cmcldeps.cxx |   25 ++++++++-----------------
 1 files changed, 8 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
CMake