[Cmake-commits] CMake branch, next, updated. v3.6.2-2038-ga37c027

[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  a37c0273b4c13741b5ab7277f1c672b2d20d2934 (commit)
       via  cc770e7670800819231ac428b75d8fc87a229116 (commit)
      from  12995aec6a806bc74591548e14a73ad2c71855cc (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a37c0273b4c13741b5ab7277f1c672b2d20d2934
commit a37c0273b4c13741b5ab7277f1c672b2d20d2934
Merge: 12995ae cc770e7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 14 11:50:52 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 14 11:50:52 2016 -0400

    Merge topic 'cmake-static-FindCacheFile' into next
    
    cc770e76 cmake: Make FindCacheFile a static method


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cc770e7670800819231ac428b75d8fc87a229116
commit cc770e7670800819231ac428b75d8fc87a229116
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 14 11:49:24 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 14 11:49:24 2016 -0400

    cmake: Make FindCacheFile a static method
    
    It does not need access to member data.

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 0d61a3d..18a7894 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -1046,7 +1046,7 @@ const char* cmake::GetHomeOutputDirectory() const
   return this->State->GetBinaryDirectory();
 }
 
-std::string cmake::FindCacheFile(const std::string& binaryDir) const
+std::string cmake::FindCacheFile(const std::string& binaryDir)
 {
   std::string cachePath = binaryDir;
   cmSystemTools::ConvertToUnixSlashes(cachePath);
diff --git a/Source/cmake.h b/Source/cmake.h
index 30661d9..6095a59 100644
--- a/Source/cmake.h
+++ b/Source/cmake.h
@@ -194,7 +194,7 @@ public:
   }
 
   ///! Return the full path to where the CMakeCache.txt file should be.
-  std::string FindCacheFile(const std::string& binaryDir) const;
+  static std::string FindCacheFile(const std::string& binaryDir);
 
   ///! Return the global generator assigned to this instance of cmake
   void SetGlobalGenerator(cmGlobalGenerator*);

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

Summary of changes:
 Source/cmake.cxx |    2 +-
 Source/cmake.h   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake