From d7539ced649ab75919c6d769ede1fca2dc08db0e Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Wed, 1 Apr 2015 19:33:41 +0200 Subject: cmMakefile: Remove bogus comment. --- Source/cmMakefile.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index e98f1d9..13f873c 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -438,10 +438,6 @@ public: */ void AddExtraDirectory(const char* dir); - - /** - * Add an auxiliary directory to the build. - */ void MakeStartDirectoriesCurrent() { this->AddDefinition("CMAKE_CURRENT_SOURCE_DIR", -- cgit v0.12 From 37897347b3fd97668d4831bba11e23f9f493e759 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Wed, 1 Apr 2015 19:34:06 +0200 Subject: cmMakefile: Remove unused method. The last user was removed in commit v2.4.0~1516 (ENH: removed unused files, 2005-06-20). --- Source/cmMakefile.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index 13f873c..5e9e87b 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -616,12 +616,6 @@ public: cmSourceFile* GetOrCreateSource(const std::string& sourceName, bool generated = false); - /** - * Obtain a list of auxiliary source directories. - */ - const std::vector& GetAuxSourceDirectories() const - {return this->AuxSourceDirectories;} - //@{ /** * Return a list of extensions associated with source and header -- cgit v0.12 From c3a60cc9cce4881f64bd0342cc841900533719e2 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Wed, 1 Apr 2015 19:35:12 +0200 Subject: cmMakefile: Remove AddExtraDirectory method. It has no effect. --- Source/cmAuxSourceDirectoryCommand.cxx | 1 - Source/cmMakefile.cxx | 6 ------ Source/cmMakefile.h | 6 ------ 3 files changed, 13 deletions(-) diff --git a/Source/cmAuxSourceDirectoryCommand.cxx b/Source/cmAuxSourceDirectoryCommand.cxx index a30d992..b8238f8 100644 --- a/Source/cmAuxSourceDirectoryCommand.cxx +++ b/Source/cmAuxSourceDirectoryCommand.cxx @@ -26,7 +26,6 @@ bool cmAuxSourceDirectoryCommand::InitialPass std::string sourceListValue; std::string templateDirectory = args[0]; - this->Makefile->AddExtraDirectory(templateDirectory.c_str()); std::string tdir; if(!cmSystemTools::FileIsFullPath(templateDirectory.c_str())) { diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 7f355a6..a89ebc5 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -114,7 +114,6 @@ cmMakefile::cmMakefile(const cmMakefile& mf): Internal(new Internals) this->Internal->VarUsageStack.push(mf.Internal->VarUsageStack.top()); this->Prefix = mf.Prefix; - this->AuxSourceDirectories = mf.AuxSourceDirectories; this->cmStartDirectory = mf.cmStartDirectory; this->StartOutputDirectory = mf.StartOutputDirectory; this->cmHomeDirectory = mf.cmHomeDirectory; @@ -2256,11 +2255,6 @@ void cmMakefile::AddSourceGroup(const std::vector& name, #endif -void cmMakefile::AddExtraDirectory(const char* dir) -{ - this->AuxSourceDirectories.push_back(dir); -} - static bool mightExpandVariablesCMP0019(const char* s) { return s && *s && strstr(s,"${") && strchr(s,'}'); diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index 5e9e87b..7891f37 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -433,11 +433,6 @@ public: bool HasCMP0054AlreadyBeenReported( cmListFileContext context) const; - /** - * Add an auxiliary directory to the build. - */ - void AddExtraDirectory(const char* dir); - void MakeStartDirectoriesCurrent() { this->AddDefinition("CMAKE_CURRENT_SOURCE_DIR", @@ -967,7 +962,6 @@ protected: void CheckForUnused(const char* reason, const std::string& name) const; std::string Prefix; - std::vector AuxSourceDirectories; // std::string cmStartDirectory; std::string StartOutputDirectory; -- cgit v0.12 From 1fcf590b146bd01a64cde30ba0b5ab7fe2e05b64 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Wed, 1 Apr 2015 19:46:06 +0200 Subject: cmMakefile: Remove unused SubDirectoryOrder member. The last use was removed in v2.4.0~2054 (ENH: add support for out of source source, 2005-03-14) --- Source/cmMakefile.cxx | 1 - Source/cmMakefile.h | 2 -- 2 files changed, 3 deletions(-) diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index a89ebc5..bf33e70 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -144,7 +144,6 @@ cmMakefile::cmMakefile(const cmMakefile& mf): Internal(new Internals) this->LocalGenerator = mf.LocalGenerator; this->FunctionBlockers = mf.FunctionBlockers; this->MacrosList = mf.MacrosList; - this->SubDirectoryOrder = mf.SubDirectoryOrder; this->Properties = mf.Properties; this->PreOrder = mf.PreOrder; this->WarnUnused = mf.WarnUnused; diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index 7891f37..864f8b0 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -1051,8 +1051,6 @@ private: std::vector MacrosList; - std::map SubDirectoryOrder; - mutable cmsys::RegularExpression cmDefineRegex; mutable cmsys::RegularExpression cmDefine01Regex; mutable cmsys::RegularExpression cmAtVarRegex; -- cgit v0.12 From aafe2821889333ee647c67e0fc55472d7903c02a Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Wed, 1 Apr 2015 19:48:09 +0200 Subject: cmMakefile: Remove unused Prefix member. Unused since it was added in commit 1f42f521 (NEW: move from tools and config to create CMake, 2000-08-29). --- Source/cmMakefile.cxx | 1 - Source/cmMakefile.h | 2 -- 2 files changed, 3 deletions(-) diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index bf33e70..6303ffe 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -113,7 +113,6 @@ cmMakefile::cmMakefile(const cmMakefile& mf): Internal(new Internals) this->Internal->VarInitStack.push(mf.Internal->VarInitStack.top()); this->Internal->VarUsageStack.push(mf.Internal->VarUsageStack.top()); - this->Prefix = mf.Prefix; this->cmStartDirectory = mf.cmStartDirectory; this->StartOutputDirectory = mf.StartOutputDirectory; this->cmHomeDirectory = mf.cmHomeDirectory; diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index 864f8b0..321caea 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -961,8 +961,6 @@ protected: // Check for a an unused variable void CheckForUnused(const char* reason, const std::string& name) const; - std::string Prefix; - std::string cmStartDirectory; std::string StartOutputDirectory; std::string cmHomeDirectory; -- cgit v0.12 From f2e07a6d90806d50b6897051c2275e38689d16e7 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Wed, 1 Apr 2015 20:01:52 +0200 Subject: cmMakefile: Remove unused PreOrder member. Remove references from dependendent API. --- Source/cmAddSubDirectoryCommand.cxx | 2 +- Source/cmMakefile.cxx | 9 +++------ Source/cmMakefile.h | 12 ++---------- Source/cmSubdirCommand.cxx | 7 +++---- 4 files changed, 9 insertions(+), 21 deletions(-) diff --git a/Source/cmAddSubDirectoryCommand.cxx b/Source/cmAddSubDirectoryCommand.cxx index 01598bc..9d55c1a 100644 --- a/Source/cmAddSubDirectoryCommand.cxx +++ b/Source/cmAddSubDirectoryCommand.cxx @@ -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; } diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 6303ffe..6fbcaeb 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -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) { diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index 321caea..ebfe508 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -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& 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; diff --git a/Source/cmSubdirCommand.cxx b/Source/cmSubdirCommand.cxx index 93ad4f3..7cb2edc 100644 --- a/Source/cmSubdirCommand.cxx +++ b/Source/cmSubdirCommand.cxx @@ -22,7 +22,6 @@ bool cmSubdirCommand } bool res = true; bool excludeFromAll = false; - bool preorder = false; for(std::vector::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 { -- cgit v0.12