diff options
| -rw-r--r-- | Source/cmMakefile.cxx | 17 | ||||
| -rw-r--r-- | Source/cmMakefile.h | 2 | ||||
| -rw-r--r-- | Source/cmOptionCommand.cxx | 6 |
3 files changed, 2 insertions, 23 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index ef9a726..6732eec 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -1720,23 +1720,6 @@ void cmMakefile::AddDefinition(const char* name, bool value) #endif } - -void cmMakefile::AddCacheDefinition(const char* name, - bool value, - const char* doc) -{ - bool val = 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) { this->Internal->VarStack.top().Set(name, 0); diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index 7123eb5..6c3d218 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -294,8 +294,6 @@ public: * Add bool variable definition to the build. */ void AddDefinition(const char* name, bool); - ///! Add a definition to this makefile and the global cmake cache. - void AddCacheDefinition(const char* name, bool, const char* doc); /** * Remove a variable definition from the build. This is not valid diff --git a/Source/cmOptionCommand.cxx b/Source/cmOptionCommand.cxx index 0c70411..8f2bd66 100644 --- a/Source/cmOptionCommand.cxx +++ b/Source/cmOptionCommand.cxx @@ -69,9 +69,7 @@ bool cmOptionCommand { initialValue = args[2]; } - this->Makefile->AddCacheDefinition(args[0].c_str(), - cmSystemTools::IsOn(initialValue.c_str()), - args[1].c_str()); - + this->Makefile->AddCacheDefinition(args[0].c_str(), initialValue.c_str(), + args[1].c_str(), cmCacheManager::BOOL); return true; } |