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

Merge topic 'minor-cleanups'

Browse Source 
22d09ecf cmLocalGenerator: Remove ConfigureFinalPass.
821a711b project(): Remove unused variable.
This commit is contained in:
Brad King 2015-06-11 13:16:16 -04:00 committed by CMake Topic Stage
commit 71d5245990
4 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmGlobalGenerator.cxx
View File

@ -1540,7 +1540,7 @@ void cmGlobalGenerator::CheckLocalGenerators()
cmState* state = this->GetCMakeInstance()->GetState(); cmState* state = this->GetCMakeInstance()->GetState();
for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i) for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i)
{ {
this->LocalGenerators[i]->ConfigureFinalPass(); this->LocalGenerators[i]->GetMakefile()->ConfigureFinalPass();
cmTargets &targets = cmTargets &targets =
this->LocalGenerators[i]->GetMakefile()->GetTargets(); this->LocalGenerators[i]->GetMakefile()->GetTargets();
for (cmTargets::iterator l = targets.begin(); for (cmTargets::iterator l = targets.begin();

5
Source/cmLocalGenerator.cxx
View File

@ -113,11 +113,6 @@ void cmLocalGenerator::ComputeObjectMaxPath()
this->ObjectMaxPathViolations.clear(); this->ObjectMaxPathViolations.clear();
} }
void cmLocalGenerator::ConfigureFinalPass()
{
this->Makefile->ConfigureFinalPass();
}
void cmLocalGenerator::TraceDependencies() void cmLocalGenerator::TraceDependencies()
{ {
std::vector<std::string> configs; std::vector<std::string> configs;

5
Source/cmLocalGenerator.h
View File

@ -54,11 +54,6 @@ public:
virtual void AddHelperCommands() {} virtual void AddHelperCommands() {}
/**
* Perform any final calculations prior to generation
*/
void ConfigureFinalPass();
/** /**
* Generate the install rules files in this directory. * Generate the install rules files in this directory.
*/ */

1
Source/cmProjectCommand.cxx
View File

@ -233,7 +233,6 @@ bool cmProjectCommand
const char* include = this->Makefile->GetDefinition(extraInclude); const char* include = this->Makefile->GetDefinition(extraInclude);
if(include) if(include)
{ {
std::string fullFilePath;
bool readit = bool readit =
this->Makefile->ReadDependentFile(include); this->Makefile->ReadDependentFile(include);
if(!readit && !cmSystemTools::GetFatalErrorOccured()) if(!readit && !cmSystemTools::GetFatalErrorOccured())