diff options
| author | Brad King <brad.king@kitware.com> | 2016-09-15 12:46:37 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-09-15 12:46:37 (GMT) |
| commit | 62a79dccc5f30e0e80904e83dada288b78d80182 (patch) | |
| tree | b06b6e1c01fcbb360a01056236d438464ceb23be /Source | |
| parent | 0063b6b43c77741944fc2d55fbab05a0750e321b (diff) | |
| parent | cc770e7670800819231ac428b75d8fc87a229116 (diff) | |
| download | CMake-62a79dccc5f30e0e80904e83dada288b78d80182.zip CMake-62a79dccc5f30e0e80904e83dada288b78d80182.tar.gz CMake-62a79dccc5f30e0e80904e83dada288b78d80182.tar.bz2 | |
Merge topic 'cmake-static-FindCacheFile'
cc770e76 cmake: Make FindCacheFile a static method
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmake.cxx | 2 | ||||
| -rw-r--r-- | Source/cmake.h | 2 |
2 files changed, 2 insertions, 2 deletions
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*); |