diff options
author | Bruno Manganelli <bruno.manga95@gmail.com> | 2018-11-22 21:05:05 (GMT) |
---|---|---|
committer | Bruno Manganelli <bruno.manga95@gmail.com> | 2019-01-21 15:34:16 (GMT) |
commit | 3e867ed4003e33ace2de6027f9bedb9aa7718b0c (patch) | |
tree | 9fe1b65a8b7e96c9a964761089dd1d48d5385937 /Source/cmCacheManager.cxx | |
parent | c144db1b8ca1ea2e3dad397123f110956a439030 (diff) | |
download | CMake-3e867ed4003e33ace2de6027f9bedb9aa7718b0c.zip CMake-3e867ed4003e33ace2de6027f9bedb9aa7718b0c.tar.gz CMake-3e867ed4003e33ace2de6027f9bedb9aa7718b0c.tar.bz2 |
cmake: inlined files dir constant and removed it from cmake.h
Diffstat (limited to 'Source/cmCacheManager.cxx')
-rw-r--r-- | Source/cmCacheManager.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx index e1d312b..c59ffa0 100644 --- a/Source/cmCacheManager.cxx +++ b/Source/cmCacheManager.cxx @@ -16,7 +16,6 @@ #include "cmState.h" #include "cmSystemTools.h" #include "cmVersion.h" -#include "cmake.h" cmCacheManager::cmCacheManager() { @@ -27,7 +26,7 @@ cmCacheManager::cmCacheManager() void cmCacheManager::CleanCMakeFiles(const std::string& path) { std::string glob = path; - glob += cmake::GetCMakeFilesDirectory(); + glob += "/CMakeFiles"; glob += "/*.cmake"; cmsys::Glob globIt; globIt.FindFiles(glob); @@ -360,7 +359,7 @@ bool cmCacheManager::SaveCache(const std::string& path, cmMessenger* messenger) fout << "\n"; fout.Close(); std::string checkCacheFile = path; - checkCacheFile += cmake::GetCMakeFilesDirectory(); + checkCacheFile += "/CMakeFiles"; cmSystemTools::MakeDirectory(checkCacheFile); checkCacheFile += "/cmake.check_cache"; cmsys::ofstream checkCache(checkCacheFile.c_str()); @@ -384,7 +383,7 @@ bool cmCacheManager::DeleteCache(const std::string& path) cmSystemTools::RemoveFile(cacheFile); // now remove the files in the CMakeFiles directory // this cleans up language cache files - cmakeFiles += cmake::GetCMakeFilesDirectory(); + cmakeFiles += "/CMakeFiles"; if (cmSystemTools::FileIsDirectory(cmakeFiles)) { cmSystemTools::RemoveADirectory(cmakeFiles); } |