[Cmake-commits] CMake branch, next, updated. v3.2.2-1938-gc753650

[Stephen Kelly]

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  c753650a464694b3e11f6bd59bf63dbd6fb2f4de (commit)
       via  98c51dc30dad93e53b7666f53aab2dd8c7812e6e (commit)
       via  d995c9f06a68c5273528386debc733ee1b23b6b0 (commit)
      from  6d45daa423a2b8561ae2e2ad183f89807bf026ba (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=c753650a464694b3e11f6bd59bf63dbd6fb2f4de
commit c753650a464694b3e11f6bd59bf63dbd6fb2f4de
Merge: 6d45daa 98c51dc
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Apr 18 10:44:23 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Apr 18 10:44:23 2015 -0400

    Merge topic 'clean-up-cmMakefile' into next
    
    98c51dc3 Make GHS build.
    d995c9f0 Fix Borland.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=98c51dc30dad93e53b7666f53aab2dd8c7812e6e
commit 98c51dc30dad93e53b7666f53aab2dd8c7812e6e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Apr 18 16:43:37 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Apr 18 16:43:37 2015 +0200

    Make GHS build.

diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 111e238..9160de8 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -448,6 +448,10 @@ public:
   const char* GetCurrentSourceDirectory() const;
   void SetCurrentBinaryDirectory(const std::string& dir);
   const char* GetCurrentBinaryDirectory() const;
+  const char* GetStartOutputDirectory() const
+  {
+    return this->GetCurrentBinaryDirectory();
+  }
 
   /* Get the current CMakeLists.txt file that is being processed.  This
    * is just used in order to be able to 'branch' from one file to a second

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d995c9f06a68c5273528386debc733ee1b23b6b0
commit d995c9f06a68c5273528386debc733ee1b23b6b0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Apr 18 16:42:18 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Apr 18 16:42:18 2015 +0200

    Fix Borland.

diff --git a/Source/cmGlobalBorlandMakefileGenerator.cxx b/Source/cmGlobalBorlandMakefileGenerator.cxx
index b81d53a..e557619 100644
--- a/Source/cmGlobalBorlandMakefileGenerator.cxx
+++ b/Source/cmGlobalBorlandMakefileGenerator.cxx
@@ -29,7 +29,7 @@ void cmGlobalBorlandMakefileGenerator
                  cmMakefile *mf,
                  bool optional)
 {
-  std::string outdir = this->CMakeInstance->GetCurrentBinaryDirectory();
+  std::string outdir = this->CMakeInstance->GetHomeOutputDirectory();
   mf->AddDefinition("BORLAND", "1");
   mf->AddDefinition("CMAKE_GENERATOR_CC", "bcc32");
   mf->AddDefinition("CMAKE_GENERATOR_CXX", "bcc32");

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

Summary of changes:
 Source/cmGlobalBorlandMakefileGenerator.cxx |    2 +-
 Source/cmMakefile.h                         |    4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake