[Cmake-commits] CMake branch, next, updated. v2.8.8-3164-ge70cfcd

[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  e70cfcd6cea8efe2c663af9365a8689a132d3fdd (commit)
       via  eda30754781a3ef4d3a0e9fa72f1bade50bb6a94 (commit)
      from  d95b55031e66675c6f90b2a0de7442a1f78b0fe6 (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=e70cfcd6cea8efe2c663af9365a8689a132d3fdd
commit e70cfcd6cea8efe2c663af9365a8689a132d3fdd
Merge: d95b550 eda3075
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Thu Jun 14 11:28:04 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 14 11:28:04 2012 -0400

    Merge topic 'ninja-cldeps' into next
    
    eda3075 Ninja: sh needs something befor and after &&


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eda30754781a3ef4d3a0e9fa72f1bade50bb6a94
commit eda30754781a3ef4d3a0e9fa72f1bade50bb6a94
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Thu Jun 14 16:20:49 2012 +0200
Commit:     Peter Kuemmel <syntheticpp at gmx.net>
CommitDate: Thu Jun 14 17:26:01 2012 +0200

    Ninja: sh needs something befor and after &&

diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 12e871f..22f77f0 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -479,14 +479,13 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
 
     if (targetOutput == targetOutputReal) {
       vars["POST_BUILD"] = postBuildCmdLine;
+      if (preLinkCmdLines.empty()) {
+        // rule with PRE_LINK will be selected, feed it
+        vars["PRE_LINK"] = locGtor->nopCommand();
+      }
     } else {
-      vars["POST_BUILD"] = ":";
       symlinkVars["POST_BUILD"] = postBuildCmdLine;
     }
-    if (preLinkCmdLines.empty()) {
-      // rule with PRE_LINK will be selected, feed it
-      vars["PRE_LINK"] = locGtor->nopCommand();
-    }
   }
 
   bool suppressShell = preLinkCmdLines.empty() && postBuildCmdLines.empty();
@@ -496,7 +495,16 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
   cmdLineLimit = 8000;
 #else
   // cmdLineLimit = ?? TODO
-  suppressShell = true;
+  suppressShell = false;
+
+  // TODO also use _NOSHELL rule
+  if (vars.find("PRE_LINK") == vars.end())
+    vars["PRE_LINK"] = locGtor->nopCommand();
+  if (vars.find("POST_BUILD") == vars.end())
+    vars["POST_BUILD"] = locGtor->nopCommand();
+  if (targetOutput != targetOutputReal &&
+      symlinkVars.find("POST_BUILD") == symlinkVars.end())
+    symlinkVars["POST_BUILD"] = locGtor->nopCommand();
 #endif
   // Write the build statement for this target.
   cmGlobalNinjaGenerator::WriteBuild(this->GetBuildFileStream(),

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

Summary of changes:
 Source/cmNinjaNormalTargetGenerator.cxx |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake