kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'cmake-static-FindCacheFile' 

cc770e76 cmake: Make FindCacheFile a static method
This commit is contained in:
Brad King 2016-09-15 08:46:37 -04:00 committed by CMake Topic Stage
parent 0063b6b43c cc770e7670
commit 62a79dccc5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmake.cxx
View File

@ -1046,7 +1046,7 @@ const char* cmake::GetHomeOutputDirectory() const
return this->State->GetBinaryDirectory(); 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; std::string cachePath = binaryDir;
cmSystemTools::ConvertToUnixSlashes(cachePath); cmSystemTools::ConvertToUnixSlashes(cachePath);

2
Source/cmake.h
View File

@ -194,7 +194,7 @@ public:
} }
///! Return the full path to where the CMakeCache.txt file should be. ///! 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 ///! Return the global generator assigned to this instance of cmake
void SetGlobalGenerator(cmGlobalGenerator*); void SetGlobalGenerator(cmGlobalGenerator*);