[Cmake-commits] CMake branch, next, updated. v3.3.2-3113-g2cdc6d0
Stephen Kelly
steveire at gmail.com
Sat Sep 19 07:25:11 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 2cdc6d0941cd1c83e3a89cb4913f2b419afde70c (commit)
via 3f83ce6cf1872a23f10233f4c062cfd143334ecd (commit)
via e66e92256a93c69c45e0207e3cb349f7d71bf245 (commit)
via 9f1ee3e46814023ffddd629479801b4d2678b6b9 (commit)
via 95c58026b648ad68e89f3e90b6840fd5a89c3043 (commit)
via d3f6ff43cf7dd25f80172733991dc9d3087c2eca (commit)
via 26cae90ba94639139cc788b8572ac77d22e1b5d1 (commit)
from 9cdf5f2afd6bd40fa73bf88a17484c7229ffb850 (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=2cdc6d0941cd1c83e3a89cb4913f2b419afde70c
commit 2cdc6d0941cd1c83e3a89cb4913f2b419afde70c
Merge: 9cdf5f2 3f83ce6
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Sep 19 07:25:06 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Sep 19 07:25:06 2015 -0400
Merge topic 'fix-max-path-initialization' into next
3f83ce6c cmLocalGenerator: Compute object max path on construction.
e66e9225 cmGlobalGenerator: Create all local generators after Configure().
9f1ee3e4 cmGlobalGenerator: Remove unused method.
95c58026 cmGlobalGenerator: Create local generators after all makefiles configured.
d3f6ff43 cmGlobalGenerator: Create local generator after configuring the makefile.
26cae90b cmMakefile: Create the local generator after configuring the makefile.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3f83ce6cf1872a23f10233f4c062cfd143334ecd
commit 3f83ce6cf1872a23f10233f4c062cfd143334ecd
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Sep 19 13:13:54 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Sep 19 13:14:30 2015 +0200
cmLocalGenerator: Compute object max path on construction.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 87a26b4..3f14e72 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1252,11 +1252,6 @@ 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 97a9f1e..3ad4abe 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -54,6 +54,8 @@ 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 771131f..6ea414a 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -300,7 +300,6 @@ 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,
@@ -360,6 +359,8 @@ private:
bool GetShouldUseOldFlags(bool shared, const std::string &lang) const;
void AddPositionIndependentFlags(std::string& flags, std::string const& l,
int targetType);
+
+ void ComputeObjectMaxPath();
};
#endif
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e66e92256a93c69c45e0207e3cb349f7d71bf245
commit e66e92256a93c69c45e0207e3cb349f7d71bf245
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Aug 2 12:12:18 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Sep 19 13:12:38 2015 +0200
cmGlobalGenerator: Create all local generators after Configure().
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 20c3d12..87a26b4 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1123,8 +1123,6 @@ void cmGlobalGenerator::Configure()
dirMf->Configure();
dirMf->EnforceDirectoryLevelRules();
- this->CreateLocalGenerators();
-
// Put a copy of each global target in every directory.
cmTargets globalTargets;
this->CreateDefaultGlobalTargets(&globalTargets);
@@ -1182,6 +1180,7 @@ 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=9f1ee3e46814023ffddd629479801b4d2678b6b9
commit 9f1ee3e46814023ffddd629479801b4d2678b6b9
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Sep 19 13:12:25 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Sep 19 13:12:38 2015 +0200
cmGlobalGenerator: Remove unused method.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 25ff3c4..20c3d12 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1943,12 +1943,6 @@ 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 9e0972a..608381d 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -186,7 +186,6 @@ 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=95c58026b648ad68e89f3e90b6840fd5a89c3043
commit 95c58026b648ad68e89f3e90b6840fd5a89c3043
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Sep 13 20:36:06 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Sep 19 13:11:44 2015 +0200
cmGlobalGenerator: Create local generators after all makefiles configured.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 5df64b8..25ff3c4 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1089,6 +1089,18 @@ 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;
@@ -1111,7 +1123,7 @@ void cmGlobalGenerator::Configure()
dirMf->Configure();
dirMf->EnforceDirectoryLevelRules();
- this->LocalGenerators.push_back(this->CreateLocalGenerator(dirMf));
+ this->CreateLocalGenerators();
// Put a copy of each global target in every directory.
cmTargets globalTargets;
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 9fc2d45..9e0972a 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -464,6 +464,8 @@ 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 93aa3e4..6480667 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1680,11 +1680,6 @@ 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=d3f6ff43cf7dd25f80172733991dc9d3087c2eca
commit d3f6ff43cf7dd25f80172733991dc9d3087c2eca
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Sep 13 20:32:33 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Sep 19 13:09:44 2015 +0200
cmGlobalGenerator: Create local generator after configuring the makefile.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 33b04ac..5df64b8 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1097,8 +1097,6 @@ 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
@@ -1113,6 +1111,8 @@ 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=26cae90ba94639139cc788b8572ac77d22e1b5d1
commit 26cae90ba94639139cc788b8572ac77d22e1b5d1
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Sep 13 20:31:17 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Sep 19 13:09:41 2015 +0200
cmMakefile: Create the local generator after configuring the makefile.
The local generator is not used during configure time.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 8a3d197..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)
@@ -1756,11 +1761,6 @@ void cmMakefile::AddSubDirectory(const std::string& srcPath,
cmMakefile* subMf = new cmMakefile(this->GlobalGenerator, newSnapshot);
this->GetGlobalGenerator()->AddMakefile(subMf);
- // create a new local generator and set its parent
- cmLocalGenerator *lg2 = this->GetGlobalGenerator()
- ->CreateLocalGenerator(subMf);
- this->GetGlobalGenerator()->AddLocalGenerator(lg2);
-
// set the subdirs start dirs
subMf->SetCurrentSourceDirectory(srcPath);
subMf->SetCurrentBinaryDirectory(binPath);
-----------------------------------------------------------------------
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, 19 insertions(+), 20 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list