[Cmake-commits] CMake branch, next, updated. v3.3.0-rc1-149-g641a3e3

[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  641a3e3f88314ef78a27c55f92a369c844a24b4f (commit)
       via  da68b59e51199d851b8d956cbfbdf8c8f2e487f5 (commit)
      from  ca6952860c9fda285bee5ce7c199cca0ece1c519 (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=641a3e3f88314ef78a27c55f92a369c844a24b4f
commit 641a3e3f88314ef78a27c55f92a369c844a24b4f
Merge: ca69528 da68b59
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jun 6 03:35:26 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Jun 6 03:35:26 2015 -0400

    Merge topic 'clean-up-cmMakefile' into next
    
    da68b59e Revert "cmMakefile: Add a method to abstract access to execution file."


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=da68b59e51199d851b8d956cbfbdf8c8f2e487f5
commit da68b59e51199d851b8d956cbfbdf8c8f2e487f5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jun 6 09:34:40 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Jun 6 09:35:07 2015 +0200

    Revert "cmMakefile: Add a method to abstract access to execution file."
    
    This reverts commit ce14340c7a8a1beb32a5cb6f8f1129d3d5a5dda8.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 9bf985d..3ac77e9 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -306,15 +306,6 @@ cmListFileContext cmMakefile::GetExecutionContext() const
   return *this->CallStack.back().Context;
 }
 
-std::string cmMakefile::GetExecutionFilePath() const
-{
-  if (this->CallStack.empty())
-    {
-    return std::string();
-    }
-  return this->CallStack.back().Context->FilePath;
-}
-
 //----------------------------------------------------------------------------
 void cmMakefile::PrintCommandTrace(const cmListFileFunction& lff) const
 {
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 00218bf..def0c23 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -570,8 +570,6 @@ public:
   cmListFileBacktrace GetBacktrace() const;
   cmListFileBacktrace GetBacktrace(cmListFileContext const& lfc) const;
   cmListFileContext GetExecutionContext() const;
-  std::string GetExecutionFilePath() const;
-
 
   /**
    * Get the vector of  files created by this makefile

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

Summary of changes:
 Source/cmMakefile.cxx |    9 ---------
 Source/cmMakefile.h   |    2 --
 2 files changed, 11 deletions(-)


hooks/post-receive
-- 
CMake