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

Remove barely-used cmCacheManager::AddCacheEntry

Browse Source 
The commit "Remove barely-used cmMakefile::AddCacheDefinition" removed
all but one use of the cmCacheManager method 'bool' overload.  This
commit removes the other use and the entire method, thus reducing code
duplication.
This commit is contained in:
Brad King 2009-09-11 10:04:10 -04:00
parent 7a409fd573
commit 74b79d3b39
3 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/cmCacheManager.cxx
View File

@ -766,19 +766,6 @@ void cmCacheManager::AddCacheEntry(const char* key,
this->Cache[key] = e; this->Cache[key] = e;
} }
void cmCacheManager::AddCacheEntry(const char* key, bool v,
const char* helpString)
{
if(v)
{
this->AddCacheEntry(key, "ON", helpString, cmCacheManager::BOOL);
}
else
{
this->AddCacheEntry(key, "OFF", helpString, cmCacheManager::BOOL);
}
}
bool cmCacheManager::CacheIterator::IsAtEnd() const bool cmCacheManager::CacheIterator::IsAtEnd() const
{ {
return this->Position == this->Container.Cache.end(); return this->Position == this->Container.Cache.end();

3
Source/cmCacheManager.h
View File

@ -164,9 +164,6 @@ protected:
void AddCacheEntry(const char* key, const char* value, void AddCacheEntry(const char* key, const char* value,
const char* helpString, CacheEntryType type); const char* helpString, CacheEntryType type);
///! Add a BOOL entry into the cache
void AddCacheEntry(const char* key, bool, const char* helpString);
///! Get a cache entry object for a key ///! Get a cache entry object for a key
CacheEntry *GetCacheEntry(const char *key); CacheEntry *GetCacheEntry(const char *key);
///! Clean out the CMakeFiles directory if no CMakeCache.txt ///! Clean out the CMakeFiles directory if no CMakeCache.txt

5
Source/cmake.cxx
View File

@ -2153,8 +2153,9 @@ int cmake::ActualConfigure()
if(!this->CacheManager->GetCacheValue("CMAKE_USE_RELATIVE_PATHS")) if(!this->CacheManager->GetCacheValue("CMAKE_USE_RELATIVE_PATHS"))
{ {
this->CacheManager->AddCacheEntry this->CacheManager->AddCacheEntry
("CMAKE_USE_RELATIVE_PATHS", false, ("CMAKE_USE_RELATIVE_PATHS", "OFF",
"If true, cmake will use relative paths in makefiles and projects."); "If true, cmake will use relative paths in makefiles and projects.",
cmCacheManager::BOOL);
cmCacheManager::CacheIterator it = cmCacheManager::CacheIterator it =
this->CacheManager->GetCacheIterator("CMAKE_USE_RELATIVE_PATHS"); this->CacheManager->GetCacheIterator("CMAKE_USE_RELATIVE_PATHS");
if ( !it.PropertyExists("ADVANCED") ) if ( !it.PropertyExists("ADVANCED") )