|
|
@@ -1730,8 +1730,7 @@ void cmMakefile::AddDefinition(const std::string& name, const char* value)
|
|
|
}
|
|
|
|
|
|
this->Internal->SetDefinition(name, value);
|
|
|
- if (!this->Internal->VarUsageStack.empty() &&
|
|
|
- this->VariableInitialized(name))
|
|
|
+ if (this->VariableInitialized(name))
|
|
|
{
|
|
|
this->CheckForUnused("changing definition", name);
|
|
|
this->Internal->VarUsageStack.top().erase(name);
|
|
|
@@ -1806,8 +1805,7 @@ void cmMakefile::AddCacheDefinition(const std::string& name, const char* value,
|
|
|
void cmMakefile::AddDefinition(const std::string& name, bool value)
|
|
|
{
|
|
|
this->Internal->SetDefinition(name, value ? "ON" : "OFF");
|
|
|
- if (!this->Internal->VarUsageStack.empty() &&
|
|
|
- this->VariableInitialized(name))
|
|
|
+ if (this->VariableInitialized(name))
|
|
|
{
|
|
|
this->CheckForUnused("changing definition", name);
|
|
|
this->Internal->VarUsageStack.top().erase(name);
|
|
|
@@ -1904,8 +1902,7 @@ void cmMakefile::CheckForUnused(const char* reason,
|
|
|
void cmMakefile::RemoveDefinition(const std::string& name)
|
|
|
{
|
|
|
this->Internal->RemoveDefinition(name);
|
|
|
- if (!this->Internal->VarUsageStack.empty() &&
|
|
|
- this->VariableInitialized(name))
|
|
|
+ if (this->VariableInitialized(name))
|
|
|
{
|
|
|
this->CheckForUnused("unsetting", name);
|
|
|
this->Internal->VarUsageStack.top().erase(name);
|