[Cmake-commits] CMake branch, next, updated. v2.8.9-1049-gbbbb1f3

[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  bbbb1f3e010bd294fd0605a25a123579f407885e (commit)
       via  74fc5983b953032f343b47f04a9e8a52e714f4b2 (commit)
      from  8ee84adf9c644f3fda8825cced371d153d263db6 (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=bbbb1f3e010bd294fd0605a25a123579f407885e
commit bbbb1f3e010bd294fd0605a25a123579f407885e
Merge: 8ee84ad 74fc598
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 9 08:32:13 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 9 08:32:13 2012 -0400

    Merge topic 'ninja-dont-pollute-current-dir' into next
    
    74fc598 Ninja: don't pollute current dir when using gui (#13495)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=74fc5983b953032f343b47f04a9e8a52e714f4b2
commit 74fc5983b953032f343b47f04a9e8a52e714f4b2
Author:     Peter Kümmel <syntheticpp at gmx.net>
AuthorDate: Wed Oct 3 16:14:45 2012 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 9 08:30:03 2012 -0400

    Ninja: don't pollute current dir when using gui (#13495)

diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 612e047..8f8ec41 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -662,9 +662,19 @@ cmNinjaTargetGenerator
 
 void
 cmNinjaTargetGenerator
-::EnsureDirectoryExists(const std::string& dir) const
+::EnsureDirectoryExists(const std::string& path) const
 {
-  cmSystemTools::MakeDirectory(dir.c_str());
+  if (cmSystemTools::FileIsFullPath(path.c_str()))
+    {
+    cmSystemTools::MakeDirectory(path.c_str());
+    }
+  else
+    {
+    const std::string fullPath = std::string(this->GetGlobalGenerator()->
+                                 GetCMakeInstance()->GetHomeOutputDirectory())
+                                   + "/" + path;
+    cmSystemTools::MakeDirectory(fullPath.c_str());
+    }
 }
 
 void

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

Summary of changes:


hooks/post-receive
-- 
CMake