summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-10-10 13:13:08 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-10-10 13:36:57 (GMT)
commita02e53eb947b61dd25ecd139a213d4062fbc5b62 (patch)
treed675e21e34e48bfa2589443c2a272048765fd7da
parentbec3487fa94093e696be170c4d85567c3c934545 (diff)
downloadCMake-a02e53eb947b61dd25ecd139a213d4062fbc5b62.zip
CMake-a02e53eb947b61dd25ecd139a213d4062fbc5b62.tar.gz
CMake-a02e53eb947b61dd25ecd139a213d4062fbc5b62.tar.bz2
Inline unary LoadCache.
-rw-r--r--Source/cmCacheManager.cxx6
-rw-r--r--Source/cmCacheManager.h1
-rw-r--r--Source/cmake.cxx3
3 files changed, 2 insertions, 8 deletions
diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx
index a7777d9..9dac27b 100644
--- a/Source/cmCacheManager.cxx
+++ b/Source/cmCacheManager.cxx
@@ -28,12 +28,6 @@ cmCacheManager::cmCacheManager(cmake* 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,
std::string& var,
std::string& value)
diff --git a/Source/cmCacheManager.h b/Source/cmCacheManager.h
index b779ba3..76533b5 100644
--- a/Source/cmCacheManager.h
+++ b/Source/cmCacheManager.h
@@ -99,7 +99,6 @@ public:
}
///! 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,
std::set<std::string>& excludes,
std::set<std::string>& includes);
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 8016e41..ad5f6b7 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -1752,7 +1752,8 @@ int cmake::LoadCache()
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,