From ca90f673a0f162424bd6b1ab74e72439bad9c429 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Thu, 16 Sep 2010 13:53:41 -0400 Subject: [PATCH] Fix detection of unused variables when setting --- Source/cmMakefile.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 1e12658ec..844b3022f 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -1648,7 +1648,7 @@ void cmMakefile::AddDefinition(const char* name, const char* value) #endif this->Internal->VarStack.top().Set(name, value); - if ((this->Internal->VarUsageStack.size() > 1) && + if (this->Internal->VarUsageStack.size() && this->VariableInitialized(name)) { this->CheckForUnused("changing definition", name); @@ -1719,7 +1719,7 @@ void cmMakefile::AddCacheDefinition(const char* name, const char* value, void cmMakefile::AddDefinition(const char* name, bool value) { this->Internal->VarStack.top().Set(name, value? "ON" : "OFF"); - if ((this->Internal->VarUsageStack.size() > 1) && + if (this->Internal->VarUsageStack.size() && this->VariableInitialized(name)) { this->CheckForUnused("changing definition", name); @@ -1763,7 +1763,7 @@ bool cmMakefile::VariableUsed(const char* var) const void cmMakefile::CheckForUnused(const char* reason, const char* name) const { - if (this->WarnUnused && !this->VariableUsed(name)) + if (this->WarnUnused && !this->VariableUsed(name) && this->CallStack.size()) { const cmListFileContext* file = this->CallStack.back().Context; if (this->CheckSystemVars ||