[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2750-g9adc37c

[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  9adc37ca5db8cd92e538b465b92661211ca5a434 (commit)
       via  87c0d16ab7e4128d81411db35ef05d4428b8c236 (commit)
      from  33383f27c630a3661d808ac3f87afc54a855bb8a (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=9adc37ca5db8cd92e538b465b92661211ca5a434
commit 9adc37ca5db8cd92e538b465b92661211ca5a434
Merge: 33383f2 87c0d16
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 11 10:27:21 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Apr 11 10:27:21 2013 -0400

    Merge topic 'vs-no-compiler-pdb-setting' into next
    
    87c0d16 Ninja: Fix OBJECT_DIR placeholder path conversion


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=87c0d16ab7e4128d81411db35ef05d4428b8c236
commit 87c0d16ab7e4128d81411db35ef05d4428b8c236
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 11 10:22:44 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Apr 11 10:23:33 2013 -0400

    Ninja: Fix OBJECT_DIR placeholder path conversion
    
    Transform the path using ConvertToNinjaPath just as we do for all other
    paths.  This fixes the OutOfSource test for objects in the ../OutOfBinary
    directory by computing the proper full path for the /Fd option.

diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 3fb823c..850e5ea 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -569,11 +569,9 @@ cmNinjaTargetGenerator
   EnsureParentDirectoryExists(objectFileName);
 
   std::string objectDir = cmSystemTools::GetFilenamePath(objectFileName);
-  objectDir = this->GetLocalGenerator()->Convert(objectDir.c_str(),
-                            cmLocalGenerator::START_OUTPUT,
-                            cmLocalGenerator::SHELL);
-  vars["OBJECT_DIR"] = objectDir;
-
+  vars["OBJECT_DIR"] = this->GetLocalGenerator()->ConvertToOutputFormat(
+                         ConvertToNinjaPath(objectDir.c_str()).c_str(),
+                         cmLocalGenerator::SHELL);
 
   this->SetMsvcTargetPdbVariable(vars);
 

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

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


hooks/post-receive
-- 
CMake