diff --git a/Source/cmVariableRequiresCommand.cxx b/Source/cmVariableRequiresCommand.cxx index 894e7740d..b447d2362 100644 --- a/Source/cmVariableRequiresCommand.cxx +++ b/Source/cmVariableRequiresCommand.cxx @@ -25,30 +25,25 @@ bool cmVariableRequiresCommand::InitialPass(std::vector const& args this->SetError("called with incorrect number of arguments"); return false; } - m_Arguments = args; - return true; -} -void cmVariableRequiresCommand::FinalPass() -{ - std::string testVariable = m_Arguments[0]; + std::string testVariable = args[0]; if(!m_Makefile->IsOn(testVariable.c_str())) { - return; + return true; } - std::string resultVariable = m_Arguments[1]; + std::string resultVariable = args[1]; bool requirementsMet = true; std::string notSet; bool hasAdvanced = false; - for(unsigned int i = 2; i < m_Arguments.size(); ++i) + for(unsigned int i = 2; i < args.size(); ++i) { - if(!m_Makefile->IsOn(m_Arguments[i].c_str())) + if(!m_Makefile->IsOn(args[i].c_str())) { requirementsMet = false; - notSet += m_Arguments[i]; + notSet += args[i]; notSet += "\n"; cmCacheManager::CacheIterator it = - m_Makefile->GetCacheManager()->GetCacheIterator(m_Arguments[i].c_str()); + m_Makefile->GetCacheManager()->GetCacheIterator(args[i].c_str()); if(!it.IsAtEnd() && it.GetPropertyAsBool("ADVANCED")) { hasAdvanced = true; @@ -77,4 +72,6 @@ void cmVariableRequiresCommand::FinalPass() } cmSystemTools::Error(message.c_str()); } + + return true; } diff --git a/Source/cmVariableRequiresCommand.h b/Source/cmVariableRequiresCommand.h index 6ceb77a5b..02ab24843 100644 --- a/Source/cmVariableRequiresCommand.h +++ b/Source/cmVariableRequiresCommand.h @@ -40,8 +40,6 @@ public: */ virtual bool InitialPass(std::vector const& args); - ///! - virtual void FinalPass(); /** * The name of the command as specified in CMakeList.txt. */ @@ -77,7 +75,6 @@ public: cmTypeMacro(cmVariableRequiresCommand, cmCommand); private: std::string m_ErrorMessage; - std::vector m_Arguments; bool m_RequirementsMet; };