[Cmake-commits] CMake branch, next, updated. v3.3.2-3119-g25f005d
Stephen Kelly
steveire at gmail.com
Sun Sep 20 08:17:02 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 25f005d61282de0d8b68391fe4feb26dde037e0e (commit)
via 6b5d9d8bbbafe101ff1f5123168d058280edf4ff (commit)
via 1edcf7ad8f33a103bfbc4b08ddde4c9056353d81 (commit)
via acd16632eed08e6058770f7aea146a98510c49c4 (commit)
via 4679cbe9aa905d891ab07dc70eaacbaa50b5bc5e (commit)
via df4909a5335424d6dd67cf05e39f6d219ce4f322 (commit)
from 2cdc6d0941cd1c83e3a89cb4913f2b419afde70c (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=25f005d61282de0d8b68391fe4feb26dde037e0e
commit 25f005d61282de0d8b68391fe4feb26dde037e0e
Merge: 2cdc6d0 6b5d9d8
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Sep 20 08:17:00 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Sep 20 08:17:00 2015 -0400
Merge topic 'fix-max-path-initialization' into next
6b5d9d8b Revert "cmGlobalGenerator: Create local generator after configuring the makefile."
1edcf7ad Revert "cmGlobalGenerator: Create local generators after all makefiles configured."
acd16632 Revert "cmGlobalGenerator: Remove unused method."
4679cbe9 Revert "cmGlobalGenerator: Create all local generators after Configure()."
df4909a5 Revert "cmLocalGenerator: Compute object max path on construction."
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6b5d9d8bbbafe101ff1f5123168d058280edf4ff
commit 6b5d9d8bbbafe101ff1f5123168d058280edf4ff
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Sep 20 14:16:34 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Sep 20 14:16:34 2015 +0200
Revert "cmGlobalGenerator: Create local generator after configuring the makefile."
This reverts commit d3f6ff43cf7dd25f80172733991dc9d3087c2eca.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 5df64b8..33b04ac 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1097,6 +1097,8 @@ void cmGlobalGenerator::Configure()
cmMakefile* dirMf =
new cmMakefile(this, this->GetCMakeInstance()->GetCurrentSnapshot());
this->Makefiles.push_back(dirMf);
+ cmLocalGenerator *lg = this->CreateLocalGenerator(dirMf);
+ this->LocalGenerators.push_back(lg);
// set the Start directories
dirMf->SetCurrentSourceDirectory
@@ -1111,8 +1113,6 @@ void cmGlobalGenerator::Configure()
dirMf->Configure();
dirMf->EnforceDirectoryLevelRules();
- this->LocalGenerators.push_back(this->CreateLocalGenerator(dirMf));
-
// Put a copy of each global target in every directory.
cmTargets globalTargets;
this->CreateDefaultGlobalTargets(&globalTargets);
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1edcf7ad8f33a103bfbc4b08ddde4c9056353d81
commit 1edcf7ad8f33a103bfbc4b08ddde4c9056353d81
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Sep 20 14:16:07 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Sep 20 14:16:07 2015 +0200
Revert "cmGlobalGenerator: Create local generators after all makefiles configured."
This reverts commit 95c58026b648ad68e89f3e90b6840fd5a89c3043.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 25ff3c4..5df64b8 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1089,18 +1089,6 @@ void cmGlobalGenerator::ClearEnabledLanguages()
return this->CMakeInstance->GetState()->ClearEnabledLanguages();
}
-void cmGlobalGenerator::CreateLocalGenerators()
-{
- cmDeleteAll(this->LocalGenerators);
- this->LocalGenerators.clear();
- this->LocalGenerators.reserve(this->Makefiles.size());
- for (std::vector<cmMakefile*>::const_iterator it = this->Makefiles.begin();
- it != this->Makefiles.end(); ++it)
- {
- this->LocalGenerators.push_back(this->CreateLocalGenerator(*it));
- }
-}
-
void cmGlobalGenerator::Configure()
{
this->FirstTimeProgress = 0.0f;
@@ -1123,7 +1111,7 @@ void cmGlobalGenerator::Configure()
dirMf->Configure();
dirMf->EnforceDirectoryLevelRules();
- this->CreateLocalGenerators();
+ this->LocalGenerators.push_back(this->CreateLocalGenerator(dirMf));
// Put a copy of each global target in every directory.
cmTargets globalTargets;
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 9e0972a..9fc2d45 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -464,8 +464,6 @@ private:
virtual void ForceLinkerLanguages();
- void CreateLocalGenerators();
-
void CheckCompilerIdCompatibility(cmMakefile* mf,
std::string const& lang) const;
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 6480667..93aa3e4 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1680,6 +1680,11 @@ void cmMakefile::Configure()
this->AddCMakeDependFilesFromUser();
this->SetConfigured();
+
+ // create a new local generator and set its parent
+ cmLocalGenerator *lg2 = this->GetGlobalGenerator()
+ ->CreateLocalGenerator(this);
+ this->GetGlobalGenerator()->AddLocalGenerator(lg2);
}
void cmMakefile::ConfigureSubDirectory(cmMakefile *mf)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=acd16632eed08e6058770f7aea146a98510c49c4
commit acd16632eed08e6058770f7aea146a98510c49c4
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Sep 20 14:16:04 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Sep 20 14:16:04 2015 +0200
Revert "cmGlobalGenerator: Remove unused method."
This reverts commit 9f1ee3e46814023ffddd629479801b4d2678b6b9.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 20c3d12..25ff3c4 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1943,6 +1943,12 @@ void cmGlobalGenerator::AddMakefile(cmMakefile *mf)
this->CMakeInstance->UpdateProgress("Configuring", prog);
}
+//----------------------------------------------------------------------------
+void cmGlobalGenerator::AddLocalGenerator(cmLocalGenerator *lg)
+{
+ this->LocalGenerators.push_back(lg);
+}
+
void cmGlobalGenerator::AddInstallComponent(const char* component)
{
if(component && *component)
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 608381d..9e0972a 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -186,6 +186,7 @@ public:
{this->CurrentMakefile = mf;}
void AddMakefile(cmMakefile *mf);
+ void AddLocalGenerator(cmLocalGenerator *lg);
///! Set an generator for an "external makefile based project"
void SetExternalMakefileProjectGenerator(
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4679cbe9aa905d891ab07dc70eaacbaa50b5bc5e
commit 4679cbe9aa905d891ab07dc70eaacbaa50b5bc5e
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Sep 20 14:16:01 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Sep 20 14:16:01 2015 +0200
Revert "cmGlobalGenerator: Create all local generators after Configure()."
This reverts commit e66e92256a93c69c45e0207e3cb349f7d71bf245.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 87a26b4..20c3d12 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1123,6 +1123,8 @@ void cmGlobalGenerator::Configure()
dirMf->Configure();
dirMf->EnforceDirectoryLevelRules();
+ this->CreateLocalGenerators();
+
// Put a copy of each global target in every directory.
cmTargets globalTargets;
this->CreateDefaultGlobalTargets(&globalTargets);
@@ -1180,7 +1182,6 @@ void cmGlobalGenerator::Configure()
void cmGlobalGenerator::CreateGenerationObjects(TargetTypes targetTypes)
{
- this->CreateLocalGenerators();
cmDeleteAll(this->GeneratorTargets);
this->GeneratorTargets.clear();
this->CreateGeneratorTargets(targetTypes);
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=df4909a5335424d6dd67cf05e39f6d219ce4f322
commit df4909a5335424d6dd67cf05e39f6d219ce4f322
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Sep 20 14:15:57 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Sep 20 14:15:57 2015 +0200
Revert "cmLocalGenerator: Compute object max path on construction."
This reverts commit 3f83ce6cf1872a23f10233f4c062cfd143334ecd.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 3f14e72..87a26b4 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1252,6 +1252,11 @@ bool cmGlobalGenerator::Compute()
unsigned int i;
+ for (i = 0; i < this->LocalGenerators.size(); ++i)
+ {
+ this->LocalGenerators[i]->ComputeObjectMaxPath();
+ }
+
// Add generator specific helper commands
for (i = 0; i < this->LocalGenerators.size(); ++i)
{
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 3ad4abe..97a9f1e 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -54,8 +54,6 @@ cmLocalGenerator::cmLocalGenerator(cmGlobalGenerator* gg,
this->EmitUniversalBinaryFlags = true;
this->BackwardsCompatibility = 0;
this->BackwardsCompatibilityFinal = false;
-
- this->ComputeObjectMaxPath();
}
cmLocalGenerator::~cmLocalGenerator()
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 6ea414a..771131f 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -300,6 +300,7 @@ public:
void CreateEvaluationFileOutputs(const std::string& config);
void ProcessEvaluationFiles(std::vector<std::string>& generatedFiles);
+ void ComputeObjectMaxPath();
protected:
///! put all the libraries for a target on into the given stream
void OutputLinkLibraries(std::string& linkLibraries,
@@ -359,8 +360,6 @@ private:
bool GetShouldUseOldFlags(bool shared, const std::string &lang) const;
void AddPositionIndependentFlags(std::string& flags, std::string const& l,
int targetType);
-
- void ComputeObjectMaxPath();
};
#endif
-----------------------------------------------------------------------
Summary of changes:
Source/cmGlobalGenerator.cxx | 26 +++++++++++++-------------
Source/cmGlobalGenerator.h | 3 +--
Source/cmLocalGenerator.cxx | 2 --
Source/cmLocalGenerator.h | 3 +--
Source/cmMakefile.cxx | 5 +++++
5 files changed, 20 insertions(+), 19 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list