[Cmake-commits] CMake branch, next, updated. v3.3.2-3131-g41e188f
Stephen Kelly
steveire at gmail.com
Sun Sep 20 08:57:24 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 41e188f2887bc5dbec025ef3681f7f52ff17dcb2 (commit)
via 86ab3c8aba2bf0df0ef65665f5b767a07f3aed34 (commit)
via 2514fa98368ff890eeb225f350bbcac1086e70da (commit)
via 6a392fab6fb23973fec0161a9551f9eccaba5e05 (commit)
via aab1f2ff8e1e9f47c9b7cee91d3a10d71016f75b (commit)
via 962666ce90baefe72e5a05399b2c1b9b161eaeba (commit)
via a3aa333df53f705c1b4f831e50f84c5449631811 (commit)
via ba7f7067cafe187d5f95b87c959751cdf1a8b0b6 (commit)
via 0da7a4d4c7da611f16c29b59f48aaf484b6ac85b (commit)
from 152d75e3e010dd5e661af402f4085268b8cb70f1 (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=41e188f2887bc5dbec025ef3681f7f52ff17dcb2
commit 41e188f2887bc5dbec025ef3681f7f52ff17dcb2
Merge: 152d75e 86ab3c8
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Sep 20 08:57:23 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Sep 20 08:57:23 2015 -0400
Merge topic 'fix-max-path-initialization' into next
86ab3c8a cmLocalGenerator: Compute object max path on construction.
2514fa98 cmGlobalGenerator: Create all local generators after Configure().
6a392fab cmGlobalGenerator: Remove unused method.
aab1f2ff cmGlobalGenerator: Create local generators after all makefiles configured.
962666ce cmGlobalGenerator: Create local generator after configuring the makefile.
a3aa333d cmMakefile: Create the local generator after configuring the makefile.
ba7f7067 CMake Nightly Date Stamp
0da7a4d4 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=86ab3c8aba2bf0df0ef65665f5b767a07f3aed34
commit 86ab3c8aba2bf0df0ef65665f5b767a07f3aed34
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Sep 19 13:13:54 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Sep 20 14:55:56 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=2514fa98368ff890eeb225f350bbcac1086e70da
commit 2514fa98368ff890eeb225f350bbcac1086e70da
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Aug 2 12:12:18 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Sep 20 14:55:55 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=6a392fab6fb23973fec0161a9551f9eccaba5e05
commit 6a392fab6fb23973fec0161a9551f9eccaba5e05
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Sep 19 13:12:25 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Sep 20 14:55:55 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=aab1f2ff8e1e9f47c9b7cee91d3a10d71016f75b
commit aab1f2ff8e1e9f47c9b7cee91d3a10d71016f75b
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Sep 13 20:36:06 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Sep 20 14:55:52 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 720a5e4..6480667 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1772,11 +1772,6 @@ void cmMakefile::AddSubDirectory(const std::string& srcPath,
{
this->UnConfiguredDirectories.push_back(subMf);
}
-
- // create a new local generator and set its parent
- cmLocalGenerator *lg2 = this->GetGlobalGenerator()
- ->CreateLocalGenerator(subMf);
- this->GetGlobalGenerator()->AddLocalGenerator(lg2);
}
void cmMakefile::SetCurrentSourceDirectory(const std::string& dir)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=962666ce90baefe72e5a05399b2c1b9b161eaeba
commit 962666ce90baefe72e5a05399b2c1b9b161eaeba
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Sep 13 20:32:33 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Sep 20 14:55:05 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=a3aa333df53f705c1b4f831e50f84c5449631811
commit a3aa333df53f705c1b4f831e50f84c5449631811
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Sep 13 20:31:17 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Sep 20 14:55:04 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..720a5e4 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1756,11 +1756,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);
@@ -1777,6 +1772,11 @@ void cmMakefile::AddSubDirectory(const std::string& srcPath,
{
this->UnConfiguredDirectories.push_back(subMf);
}
+
+ // create a new local generator and set its parent
+ cmLocalGenerator *lg2 = this->GetGlobalGenerator()
+ ->CreateLocalGenerator(subMf);
+ this->GetGlobalGenerator()->AddLocalGenerator(lg2);
}
void cmMakefile::SetCurrentSourceDirectory(const std::string& dir)
-----------------------------------------------------------------------
Summary of changes:
Source/CMakeVersion.cmake | 2 +-
Source/cmGlobalGenerator.cxx | 26 +++++++++++++-------------
Source/cmGlobalGenerator.h | 3 ++-
Source/cmLocalGenerator.cxx | 2 ++
Source/cmLocalGenerator.h | 3 ++-
5 files changed, 20 insertions(+), 16 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list