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

Run the unused variables check on the final pass

This commit is contained in:
Ben Boeckel 2010-09-02 11:29:05 -04:00
parent 9efc05722e
commit d784e6af4d
3 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmMakefile.cxx
View File

@ -828,6 +828,8 @@ void cmMakefile::ConfigureFinalPass()
{
l->second.FinishConfigure();
}
this->GetCMakeInstance()->RunCheckForUnusedVariables();
}
//----------------------------------------------------------------------------

34
Source/cmake.cxx
View File

@ -201,21 +201,6 @@ cmake::cmake()
cmake::~cmake()
{
#ifdef CMAKE_BUILD_WITH_CMAKE
if(this->WarnUnusedCli)
{
std::map<std::string, bool>::const_iterator it;
for(it = this->UsedCliVariables.begin(); it != this->UsedCliVariables.end(); ++it)
{
if(!it->second)
{
std::string message = "warning: The variable, \"" + it->first + "\", given "
"on the command line, was not used within the build.";
cmSystemTools::Message(message.c_str());
}
}
}
#endif
delete this->CacheManager;
delete this->Policies;
if (this->GlobalGenerator)
@ -4500,3 +4485,22 @@ int cmake::Build(const std::string& dir,
config.c_str(), clean, false, 0, true,
0, nativeOptions);
}
void cmake::RunCheckForUnusedVariables() const
{
#ifdef CMAKE_BUILD_WITH_CMAKE
if(this->WarnUnusedCli)
{
std::map<std::string, bool>::const_iterator it;
for(it = this->UsedCliVariables.begin(); it != this->UsedCliVariables.end(); ++it)
{
if(!it->second)
{
std::string message = "warning: The variable, \"" + it->first + "\", given "
"on the command line, was not used within the build.";
cmSystemTools::Message(message.c_str());
}
}
}
#endif
}

2
Source/cmake.h
View File

@ -362,6 +362,8 @@ class cmake
const std::string& config,
const std::vector<std::string>& nativeOptions,
bool clean);
void RunCheckForUnusedVariables() const;
protected:
void InitializeProperties();
int HandleDeleteCacheVariables(const char* var);