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

Inline unary LoadCache.

This commit is contained in:
Stephen Kelly 2015-10-10 15:13:08 +02:00
parent bec3487fa9
commit a02e53eb94
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmCacheManager.cxx
View File

@ -28,12 +28,6 @@ cmCacheManager::cmCacheManager(cmake* cm)
this->CMakeInstance = cm; this->CMakeInstance = cm;
} }
bool cmCacheManager::LoadCache(const std::string& path)
{
std::set<std::string> emptySet;
return this->LoadCache(path, true, emptySet, emptySet);
}
static bool ParseEntryWithoutType(const std::string& entry, static bool ParseEntryWithoutType(const std::string& entry,
std::string& var, std::string& var,
std::string& value) std::string& value)

1
Source/cmCacheManager.h
View File

@ -99,7 +99,6 @@ public:
} }
///! Load a cache for given makefile. Loads from path/CMakeCache.txt. ///! Load a cache for given makefile. Loads from path/CMakeCache.txt.
bool LoadCache(const std::string& path);
bool LoadCache(const std::string& path, bool internal, bool LoadCache(const std::string& path, bool internal,
std::set<std::string>& excludes, std::set<std::string>& excludes,
std::set<std::string>& includes); std::set<std::string>& includes);

3
Source/cmake.cxx
View File

@ -1752,7 +1752,8 @@ int cmake::LoadCache()
bool cmake::LoadCache(const std::string& path) bool cmake::LoadCache(const std::string& path)
{ {
return this->CacheManager->LoadCache(path); std::set<std::string> emptySet;
return this->LoadCache(path, true, emptySet, emptySet);
} }
bool cmake::LoadCache(const std::string& path, bool internal, bool cmake::LoadCache(const std::string& path, bool internal,