[Cmake-commits] CMake branch, next, updated. v2.8.9-986-ge7048e9

[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  e7048e947331a585376af6004afdfb6c050768f7 (commit)
       via  188c73cb749ae0b248df05baf9ea6227b54864da (commit)
      from  ea0955aea733bce32c3792086aaef588e424de47 (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=e7048e947331a585376af6004afdfb6c050768f7
commit e7048e947331a585376af6004afdfb6c050768f7
Merge: ea0955a 188c73c
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Wed Oct 3 11:27:36 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 3 11:27:36 2012 -0400

    Merge topic 'ninja-compile-OBJECT_DIR' into next
    
    188c73c Ninja: also set OBJECT_DIR when compiling


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=188c73cb749ae0b248df05baf9ea6227b54864da
commit 188c73cb749ae0b248df05baf9ea6227b54864da
Author:     Peter Kümmel <syntheticpp at gmx.net>
AuthorDate: Wed Oct 3 17:19:47 2012 +0200
Commit:     Peter Kümmel <syntheticpp at gmx.net>
CommitDate: Wed Oct 3 17:24:36 2012 +0200

    Ninja: also set OBJECT_DIR when compiling
    
    BUG: 0013510

diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 612e047..811ac88 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -368,7 +368,7 @@ cmNinjaTargetGenerator
   std::string flags = "$FLAGS";
   vars.Defines = "$DEFINES";
   vars.TargetPDB = "$TARGET_PDB";
-
+  vars.ObjectDir = "$OBJECT_DIR";
 
   cmMakefile* mf = this->GetMakefile();
 
@@ -566,6 +566,13 @@ cmNinjaTargetGenerator
   vars["DEP_FILE"] = objectFileName + ".d";;
   EnsureParentDirectoryExists(objectFileName);
 
+  std::string objectDir = cmSystemTools::GetFilenamePath(objectFileName);
+  objectDir = this->GetLocalGenerator()->Convert(objectDir.c_str(),
+                            cmLocalGenerator::START_OUTPUT,
+                            cmLocalGenerator::SHELL);
+  vars["OBJECT_DIR"] = objectDir;
+
+
   this->SetMsvcTargetPdbVariable(vars);
 
   if(this->Makefile->IsOn("CMAKE_EXPORT_COMPILE_COMMANDS"))
@@ -590,6 +597,7 @@ cmNinjaTargetGenerator
 
     compileObjectVars.Source = escapedSourceFileName.c_str();
     compileObjectVars.Object = objectFileName.c_str();
+    compileObjectVars.ObjectDir = objectDir.c_str();
     compileObjectVars.Flags = vars["FLAGS"].c_str();
     compileObjectVars.Defines = vars["DEFINES"].c_str();
 

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

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


hooks/post-receive
-- 
CMake