[Cmake-commits] CMake branch, next, updated. v2.8.9-984-gea0955a

[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  ea0955aea733bce32c3792086aaef588e424de47 (commit)
       via  dd7130ae6dd582b3f5a34841021dfa4989ef57a0 (commit)
       via  17d4527032c4a7e626bbbdb0d4d88bd133c78977 (commit)
      from  17545fb1cbe8f43881f747e45699356ed9df4948 (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=ea0955aea733bce32c3792086aaef588e424de47
commit ea0955aea733bce32c3792086aaef588e424de47
Merge: 17545fb dd7130a
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Wed Oct 3 10:28:01 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 3 10:28:01 2012 -0400

    Merge topic 'ninja-dont-pollute-current-dir' into next
    
    dd7130a Ninja: don't pollute current dir when using gui
    17d4527 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dd7130ae6dd582b3f5a34841021dfa4989ef57a0
commit dd7130ae6dd582b3f5a34841021dfa4989ef57a0
Author:     Peter Kümmel <syntheticpp at gmx.net>
AuthorDate: Wed Oct 3 16:14:45 2012 +0200
Commit:     Peter Kümmel <syntheticpp at gmx.net>
CommitDate: Wed Oct 3 16:21:57 2012 +0200

    Ninja: don't pollute current dir when using gui
    
    BUG: 13495

diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 612e047..ba6f856 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:
 Source/CMakeVersion.cmake         |    2 +-
 Source/cmNinjaTargetGenerator.cxx |   14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake