[Cmake-commits] CMake branch, next, updated. v3.2.2-1973-g8e406e5

[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  8e406e58c22c7338adc846c134c1b2cc8a08e817 (commit)
       via  d5d1f9c21d3d256473ec5f58bd7789142a24bb81 (commit)
      from  592379dc1e71ddca01cdab32c6d3b160a7026e3d (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=8e406e58c22c7338adc846c134c1b2cc8a08e817
commit 8e406e58c22c7338adc846c134c1b2cc8a08e817
Merge: 592379d d5d1f9c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Apr 20 18:19:13 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Apr 20 18:19:13 2015 -0400

    Merge topic 'clean-up-cmMakefile' into next
    
    d5d1f9c2 Revert "Make GHS build."


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d5d1f9c21d3d256473ec5f58bd7789142a24bb81
commit d5d1f9c21d3d256473ec5f58bd7789142a24bb81
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Apr 21 00:18:15 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Apr 21 00:18:15 2015 +0200

    Revert "Make GHS build."
    
    This reverts commit 98c51dc30dad93e53b7666f53aab2dd8c7812e6e.

diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 9160de8..111e238 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -448,10 +448,6 @@ 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

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

Summary of changes:
 Source/cmMakefile.h |    4 ----
 1 file changed, 4 deletions(-)


hooks/post-receive
-- 
CMake