cmMakefile: Remove unused PreOrder member.

Remove references from dependendent API.
This commit is contained in:
Stephen Kelly 2015-04-01 20:01:52 +02:00
parent aafe282188
commit f2e07a6d90
4 changed files with 9 additions and 21 deletions

View File

@ -122,7 +122,7 @@ bool cmAddSubDirectoryCommand::InitialPass
// Add the subdirectory using the computed full paths.
this->Makefile->AddSubDirectory(srcPath, binPath,
excludeFromAll, false, true);
excludeFromAll, true);
return true;
}

View File

@ -101,7 +101,6 @@ cmMakefile::cmMakefile(): Internal(new Internals)
this->AddDefaultDefinitions();
this->Initialize();
this->PreOrder = false;
this->GeneratingBuildSystem = false;
this->SuppressWatches = false;
@ -144,7 +143,6 @@ cmMakefile::cmMakefile(const cmMakefile& mf): Internal(new Internals)
this->FunctionBlockers = mf.FunctionBlockers;
this->MacrosList = mf.MacrosList;
this->Properties = mf.Properties;
this->PreOrder = mf.PreOrder;
this->WarnUnused = mf.WarnUnused;
this->Initialize();
this->CheckSystemVars = mf.CheckSystemVars;
@ -1694,7 +1692,7 @@ void cmMakefile::ConfigureSubDirectory(cmLocalGenerator *lg2)
}
void cmMakefile::AddSubDirectory(const std::string& sub,
bool excludeFromAll, bool preorder)
bool excludeFromAll)
{
// the source path must be made full if it isn't already
std::string srcPath = sub;
@ -1716,13 +1714,13 @@ void cmMakefile::AddSubDirectory(const std::string& sub,
this->AddSubDirectory(srcPath, binPath,
excludeFromAll, preorder, false);
excludeFromAll, false);
}
void cmMakefile::AddSubDirectory(const std::string& srcPath,
const std::string& binPath,
bool excludeFromAll, bool preorder,
bool excludeFromAll,
bool immediate)
{
// Make sure the binary directory is unique.
@ -1744,7 +1742,6 @@ void cmMakefile::AddSubDirectory(const std::string& srcPath,
{
lg2->GetMakefile()->SetProperty("EXCLUDE_FROM_ALL", "TRUE");
}
lg2->GetMakefile()->SetPreOrder(preorder);
if (immediate)
{

View File

@ -292,11 +292,10 @@ public:
/**
* Add a subdirectory to the build.
*/
void AddSubDirectory(const std::string&, bool excludeFromAll=false,
bool preorder = false);
void AddSubDirectory(const std::string&, bool excludeFromAll=false);
void AddSubDirectory(const std::string& fullSrcDir,
const std::string& fullBinDir,
bool excludeFromAll, bool preorder,
bool excludeFromAll,
bool immediate);
/**
@ -864,10 +863,6 @@ public:
///! Initialize a makefile from its parent
void InitializeFromParent();
///! Set/Get the preorder flag
void SetPreOrder(bool p) { this->PreOrder = p; }
bool GetPreOrder() const { return this->PreOrder; }
void AddInstallGenerator(cmInstallGenerator* g)
{ if(g) this->InstallGenerators.push_back(g); }
std::vector<cmInstallGenerator*>& GetInstallGenerators()
@ -1056,9 +1051,6 @@ private:
cmPropertyMap Properties;
// should this makefile be processed before or after processing the parent
bool PreOrder;
// Unused variable flags
bool WarnUnused;
bool CheckSystemVars;

View File

@ -22,7 +22,6 @@ bool cmSubdirCommand
}
bool res = true;
bool excludeFromAll = false;
bool preorder = false;
for(std::vector<std::string>::const_iterator i = args.begin();
i != args.end(); ++i)
@ -34,7 +33,7 @@ bool cmSubdirCommand
}
if(*i == "PREORDER")
{
preorder = true;
// Ignored
continue;
}
@ -48,7 +47,7 @@ bool cmSubdirCommand
std::string(this->Makefile->GetCurrentOutputDirectory()) +
"/" + i->c_str();
this->Makefile->AddSubDirectory(srcPath, binPath,
excludeFromAll, preorder, false);
excludeFromAll, false);
}
// otherwise it is a full path
else if ( cmSystemTools::FileIsDirectory(*i) )
@ -59,7 +58,7 @@ bool cmSubdirCommand
std::string(this->Makefile->GetCurrentOutputDirectory()) +
"/" + cmSystemTools::GetFilenameName(*i);
this->Makefile->AddSubDirectory(*i, binPath,
excludeFromAll, preorder, false);
excludeFromAll, false);
}
else
{