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

ENH: Handle untyped but initialized values for boolean AddCacheDefinition. Closes Bug #118 - Specifying cache entries with -D should not need the type

This commit is contained in:
Andy Cedilnik 2003-08-08 09:26:55 -04:00
parent 91065673d6
commit 2003b4987a
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/cmMakefile.cxx
View File

@ -874,8 +874,16 @@ void cmMakefile::AddDefinition(const char* name, bool value)
void cmMakefile::AddCacheDefinition(const char* name, bool value, const char* doc) void cmMakefile::AddCacheDefinition(const char* name, bool value, const char* doc)
{ {
this->GetCacheManager()->AddCacheEntry(name, value, doc); bool val = value;
this->AddDefinition(name, value); cmCacheManager::CacheIterator it =
this->GetCacheManager()->GetCacheIterator(name);
if(!it.IsAtEnd() && (it.GetType() == cmCacheManager::UNINITIALIZED) &&
it.Initialized())
{
val = it.GetValueAsBool();
}
this->GetCacheManager()->AddCacheEntry(name, val, doc);
this->AddDefinition(name, val);
} }
void cmMakefile::RemoveDefinition(const char* name) void cmMakefile::RemoveDefinition(const char* name)