[Cmake-commits] CMake branch, next, updated. v2.8.8-3472-ge95797b

[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  e95797bd7782078e3b046f39021b2e98550ed8bc (commit)
       via  84a18cb5d659602235cc995497f5fb016560d553 (commit)
      from  eab2fb5a665bbbff69d21ffc7c5184959beebacf (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=e95797bd7782078e3b046f39021b2e98550ed8bc
commit e95797bd7782078e3b046f39021b2e98550ed8bc
Merge: eab2fb5 84a18cb
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Sun Jul 15 12:24:30 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jul 15 12:24:30 2012 -0400

    Merge topic 'ninja-cldeps-check-rc-result' into next
    
    84a18cb Ninja: also stop when .rc's .d file couldn't be generated


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=84a18cb5d659602235cc995497f5fb016560d553
commit 84a18cb5d659602235cc995497f5fb016560d553
Author:     Peter Kümmel <syntheticpp at gmx.net>
AuthorDate: Sun Jul 15 14:47:02 2012 +0200
Commit:     Peter Kümmel <syntheticpp at gmx.net>
CommitDate: Sun Jul 15 18:23:04 2012 +0200

    Ninja: also stop when .rc's .d file couldn't be generated
    
    prevents silent disappearing of .d files for resource files.
    
    cmcldeps changes directory for cl call, so relativ include paths do not work.

diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 4758989..7eb3d9e 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -143,16 +143,18 @@ cmNinjaTargetGenerator::ComputeFlagsForObject(cmSourceFile *source,
   this->LocalGenerator->AddCMP0018Flags(flags, this->Target,
                                         language.c_str());
 
-  // TODO: Handle response file.
   // Add include directory flags.
   {
   std::vector<std::string> includes;
   this->LocalGenerator->GetIncludeDirectories(includes, this->Target,
                                               language.c_str());
   std::string includeFlags =
-    this->LocalGenerator->GetIncludeFlags(includes, language.c_str(), false);
+    this->LocalGenerator->GetIncludeFlags(includes, language.c_str(),
+    language == "RC" ? true : false); // full include paths for RC
+                                      // needed by cmcldeps
   if(cmGlobalNinjaGenerator::IsMinGW())
     cmSystemTools::ReplaceString(includeFlags, "\\", "/");
+
   this->LocalGenerator->AppendFlags(flags, includeFlags.c_str());
   }
 
diff --git a/Source/cmcldeps.cxx b/Source/cmcldeps.cxx
index ce64132..f04ff87 100644
--- a/Source/cmcldeps.cxx
+++ b/Source/cmcldeps.cxx
@@ -206,7 +206,7 @@ static int process( const std::string& srcfilename,
       includes.push_back(inc);
     } else {
       if (!isFirstLine || !startsWith(line, srcfilename)) {
-        if (!quiet) {
+        if (!quiet || exit_code != 0) {
           fprintf(stdout, "%s\n", line.c_str());
         }
       } else {
@@ -267,8 +267,11 @@ int main() {
     }
 
     // extract dependencies with cl.exe
-    process(srcfilename, dfile, objfile,
-                  prefix, cl + nol + show + clrest, objdir, true);
+    int exit_code = process(srcfilename, dfile, objfile,
+                            prefix, cl + nol + show + clrest, objdir, true);
+
+    if (exit_code != 0)
+      return exit_code;
 
     // compile rc file with rc.exe
     return process(srcfilename, "" , objfile, prefix, binpath + " " + rest);

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

Summary of changes:
 Source/cmNinjaTargetGenerator.cxx |    6 ++++--
 Source/cmcldeps.cxx               |    9 ++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake