[Cmake-commits] CMake branch, next, updated. v3.2.1-1362-g6e16fb8
Stephen Kelly
steveire at gmail.com
Wed Apr 1 14:33:21 EDT 2015
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 6e16fb8832cc6fffaf0661e5f120b4b4f6f09bf9 (commit)
via dcbef5041fe0ee9a5d311a2095fd001802067897 (commit)
via f2e07a6d90806d50b6897051c2275e38689d16e7 (commit)
via aafe2821889333ee647c67e0fc55472d7903c02a (commit)
via 1fcf590b146bd01a64cde30ba0b5ab7fe2e05b64 (commit)
via c3a60cc9cce4881f64bd0342cc841900533719e2 (commit)
via 37897347b3fd97668d4831bba11e23f9f493e759 (commit)
via d7539ced649ab75919c6d769ede1fca2dc08db0e (commit)
from 4cb9f82505bcc8a653daa478b76dd3260ee725e5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6e16fb8832cc6fffaf0661e5f120b4b4f6f09bf9
commit 6e16fb8832cc6fffaf0661e5f120b4b4f6f09bf9
Merge: 4cb9f82 dcbef50
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Apr 1 14:33:20 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Apr 1 14:33:20 2015 -0400
Merge topic 'clean-up-cmMakefile' into next
dcbef504 cmMakefile: Remove ProjectName member.
f2e07a6d cmMakefile: Remove unused PreOrder member.
aafe2821 cmMakefile: Remove unused Prefix member.
1fcf590b cmMakefile: Remove unused SubDirectoryOrder member.
c3a60cc9 cmMakefile: Remove AddExtraDirectory method.
37897347 cmMakefile: Remove unused method.
d7539ced cmMakefile: Remove bogus comment.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dcbef5041fe0ee9a5d311a2095fd001802067897
commit dcbef5041fe0ee9a5d311a2095fd001802067897
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Apr 1 20:17:46 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Apr 1 20:32:48 2015 +0200
cmMakefile: Remove ProjectName member.
It is set at the same time as the PROJECT_NAME definition is set
in cmProjectCommand, and available by chaining through parents.
Implement GetProjectName() in terms of the PROJECT_NAME definition.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 6fbcaeb..8ab89c3 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -117,7 +117,6 @@ cmMakefile::cmMakefile(const cmMakefile& mf): Internal(new Internals)
this->cmHomeDirectory = mf.cmHomeDirectory;
this->HomeOutputDirectory = mf.HomeOutputDirectory;
this->cmCurrentListFile = mf.cmCurrentListFile;
- this->ProjectName = mf.ProjectName;
this->Targets = mf.Targets;
this->SourceFiles = mf.SourceFiles;
this->Tests = mf.Tests;
@@ -248,7 +247,7 @@ void cmMakefile::Print() const
std::cout << " this->cmHomeDirectory; " <<
this->cmHomeDirectory << std::endl;
std::cout << " this->ProjectName; "
- << this->ProjectName << std::endl;
+ << this->GetDefinition("PROJECT_NAME") << std::endl;
this->PrintStringVector("this->LinkDirectories", this->LinkDirectories);
#if defined(CMAKE_BUILD_WITH_CMAKE)
for( std::vector<cmSourceGroup>::const_iterator i =
@@ -1659,9 +1658,6 @@ void cmMakefile::InitializeFromParent()
// link directories
this->LinkDirectories = parent->LinkDirectories;
- // the initial project name
- this->ProjectName = parent->ProjectName;
-
// Copy include regular expressions.
this->IncludeFileRegularExpression = parent->IncludeFileRegularExpression;
this->ComplainFileRegularExpression = parent->ComplainFileRegularExpression;
@@ -1993,12 +1989,6 @@ void cmMakefile::RemoveCacheDefinition(const std::string& name)
this->GetCacheManager()->RemoveCacheEntry(name);
}
-void cmMakefile::SetProjectName(const char* p)
-{
- this->ProjectName = p;
-}
-
-
void cmMakefile::AddGlobalLinkInformation(const std::string& name,
cmTarget& target)
{
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index ebfe508..f4c319c 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -334,16 +334,11 @@ public:
void RemoveCacheDefinition(const std::string& name);
/**
- * Specify the name of the project for this build.
- */
- void SetProjectName(const char*);
-
- /**
* Get the name of the project for this build.
*/
const char* GetProjectName() const
{
- return this->ProjectName.c_str();
+ return this->GetDefinition("PROJECT_NAME");
}
/** Get the configurations to be generated. */
diff --git a/Source/cmProjectCommand.cxx b/Source/cmProjectCommand.cxx
index 61c0133..ae64789 100644
--- a/Source/cmProjectCommand.cxx
+++ b/Source/cmProjectCommand.cxx
@@ -20,7 +20,6 @@ bool cmProjectCommand
this->SetError("PROJECT called with incorrect number of arguments");
return false;
}
- this->Makefile->SetProjectName(args[0].c_str());
std::string bindir = args[0];
bindir += "_BINARY_DIR";
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f2e07a6d90806d50b6897051c2275e38689d16e7
commit f2e07a6d90806d50b6897051c2275e38689d16e7
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Apr 1 20:01:52 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Apr 1 20:32:48 2015 +0200
cmMakefile: Remove unused PreOrder member.
Remove references from dependendent API.
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<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;
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<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
{
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aafe2821889333ee647c67e0fc55472d7903c02a
commit aafe2821889333ee647c67e0fc55472d7903c02a
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Apr 1 19:48:09 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Apr 1 20:32:48 2015 +0200
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).
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;
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1fcf590b146bd01a64cde30ba0b5ab7fe2e05b64
commit 1fcf590b146bd01a64cde30ba0b5ab7fe2e05b64
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Apr 1 19:46:06 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Apr 1 20:32:47 2015 +0200
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)
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<std::string> MacrosList;
- std::map<std::string, bool> SubDirectoryOrder;
-
mutable cmsys::RegularExpression cmDefineRegex;
mutable cmsys::RegularExpression cmDefine01Regex;
mutable cmsys::RegularExpression cmAtVarRegex;
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c3a60cc9cce4881f64bd0342cc841900533719e2
commit c3a60cc9cce4881f64bd0342cc841900533719e2
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Apr 1 19:35:12 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Apr 1 20:32:47 2015 +0200
cmMakefile: Remove AddExtraDirectory method.
It has no effect.
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<std::string>& 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<std::string> AuxSourceDirectories; //
std::string cmStartDirectory;
std::string StartOutputDirectory;
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=37897347b3fd97668d4831bba11e23f9f493e759
commit 37897347b3fd97668d4831bba11e23f9f493e759
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Apr 1 19:34:06 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Apr 1 20:32:47 2015 +0200
cmMakefile: Remove unused method.
The last user was removed in commit v2.4.0~1516 (ENH: removed unused
files, 2005-06-20).
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<std::string>& GetAuxSourceDirectories() const
- {return this->AuxSourceDirectories;}
-
//@{
/**
* Return a list of extensions associated with source and header
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d7539ced649ab75919c6d769ede1fca2dc08db0e
commit d7539ced649ab75919c6d769ede1fca2dc08db0e
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Apr 1 19:33:41 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Apr 1 20:32:47 2015 +0200
cmMakefile: Remove bogus comment.
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",
-----------------------------------------------------------------------
Summary of changes:
Source/cmAddSubDirectoryCommand.cxx | 2 +-
Source/cmAuxSourceDirectoryCommand.cxx | 1 -
Source/cmMakefile.cxx | 29 ++++--------------------
Source/cmMakefile.h | 39 +++-----------------------------
Source/cmProjectCommand.cxx | 1 -
Source/cmSubdirCommand.cxx | 7 +++---
6 files changed, 11 insertions(+), 68 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list