[Cmake-commits] CMake branch, next, updated. v3.3.2-3230-g924cade
Stephen Kelly
steveire at gmail.com
Thu Sep 24 03:40: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 924cade82a7f70b68390d2745ec1075a1ef6145b (commit)
via 8bfff68642cfba9de42fa854d90a7cecbc507c83 (commit)
via 2c2479fbed07457529156be637540ae5e0b0afe7 (commit)
via 194bb06803c7dc005d9825de13bdb91fe6b7628f (commit)
via c5f07e0537f2b671f271ad8ac4b6c0a529cd4beb (commit)
via dd408de46b45926f7dfdd27cabb4dce95708d011 (commit)
via 8a88089bbef4d72aa2c448877637c5ab34f6907c (commit)
via 934aa454d0029c0cba26c7f971bdb76a1d789dc2 (commit)
via 61b48e70bc8d9add8b056030ebef97ffdb92512b (commit)
from 350d20c9fca2f6e4d49f2177dd62de4ff85333ee (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=924cade82a7f70b68390d2745ec1075a1ef6145b
commit 924cade82a7f70b68390d2745ec1075a1ef6145b
Merge: 350d20c 8bfff68
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Sep 24 03:40:22 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 24 03:40:22 2015 -0400
Merge topic 'fix-max-path-initialization' into next
8bfff686 cmLocalGenerator: Compute object max path on construction.
2c2479fb cmGlobalGenerator: Create all local generators after Configure().
194bb068 cmGlobalGenerator: Remove unused method.
c5f07e05 cmGlobalGenerator: Create local generators after all makefiles configured.
dd408de4 cmGlobalGenerator: Create local generator after configuring the makefile.
8a88089b cmMakefile: Create the local generator after configuring the makefile.
934aa454 Makefiles: Remove need to create local generator at configure time.
61b48e70 Makefiles: Port to cmOutputConverter.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8bfff68642cfba9de42fa854d90a7cecbc507c83
commit 8bfff68642cfba9de42fa854d90a7cecbc507c83
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Sep 19 13:13:54 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Sep 24 09:39:39 2015 +0200
cmLocalGenerator: Compute object max path on construction.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 9d9aaf4..3589e82 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1257,11 +1257,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 6c7b194..f4de0f2 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
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2c2479fbed07457529156be637540ae5e0b0afe7
commit 2c2479fbed07457529156be637540ae5e0b0afe7
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Aug 2 12:12:18 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Sep 24 09:39:39 2015 +0200
cmGlobalGenerator: Create all local generators after Configure().
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 8e3a1ae..9d9aaf4 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1124,7 +1124,6 @@ void cmGlobalGenerator::Configure()
// now do it
this->ConfigureDoneCMP0026 = false;
dirMf->Configure();
- this->CreateLocalGenerators();
dirMf->EnforceDirectoryLevelRules();
this->ConfigureDoneCMP0026 = true;
@@ -1186,6 +1185,7 @@ void cmGlobalGenerator::Configure()
void cmGlobalGenerator::CreateGenerationObjects(TargetTypes targetTypes)
{
+ this->CreateLocalGenerators();
cmDeleteAll(this->GeneratorTargets);
this->GeneratorTargets.clear();
this->CreateGeneratorTargets(targetTypes);
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=194bb06803c7dc005d9825de13bdb91fe6b7628f
commit 194bb06803c7dc005d9825de13bdb91fe6b7628f
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Sep 19 13:12:25 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Sep 24 09:39:39 2015 +0200
cmGlobalGenerator: Remove unused method.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 46ef2f3..8e3a1ae 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1947,12 +1947,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 b2dffcc..83cbc3f 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(
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c5f07e0537f2b671f271ad8ac4b6c0a529cd4beb
commit c5f07e0537f2b671f271ad8ac4b6c0a529cd4beb
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Sep 13 20:36:06 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Sep 24 09:39:38 2015 +0200
cmGlobalGenerator: Create local generators after all makefiles configured.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 7552c99..46ef2f3 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1091,6 +1091,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;
@@ -1112,8 +1124,7 @@ void cmGlobalGenerator::Configure()
// now do it
this->ConfigureDoneCMP0026 = false;
dirMf->Configure();
- this->LocalGenerators.insert(this->LocalGenerators.begin(),
- this->CreateLocalGenerator(dirMf));
+ this->CreateLocalGenerators();
dirMf->EnforceDirectoryLevelRules();
this->ConfigureDoneCMP0026 = true;
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 40f98dc..b2dffcc 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -466,6 +466,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)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dd408de46b45926f7dfdd27cabb4dce95708d011
commit dd408de46b45926f7dfdd27cabb4dce95708d011
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Sep 13 20:32:33 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Sep 24 09:39:38 2015 +0200
cmGlobalGenerator: Create local generator after configuring the makefile.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 7aa8bb6..7552c99 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1099,8 +1099,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
@@ -1114,6 +1112,8 @@ void cmGlobalGenerator::Configure()
// now do it
this->ConfigureDoneCMP0026 = false;
dirMf->Configure();
+ this->LocalGenerators.insert(this->LocalGenerators.begin(),
+ this->CreateLocalGenerator(dirMf));
dirMf->EnforceDirectoryLevelRules();
this->ConfigureDoneCMP0026 = true;
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8a88089bbef4d72aa2c448877637c5ab34f6907c
commit 8a88089bbef4d72aa2c448877637c5ab34f6907c
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Sep 13 20:31:17 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Sep 24 09:39:38 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)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=934aa454d0029c0cba26c7f971bdb76a1d789dc2
commit 934aa454d0029c0cba26c7f971bdb76a1d789dc2
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Sep 24 09:35:55 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Sep 24 09:39:38 2015 +0200
Makefiles: Remove need to create local generator at configure time.
This method is used during try_compile.
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 1adc379..0064713 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -578,23 +578,18 @@ void cmGlobalUnixMakefileGenerator3
if (!targetName.empty())
{
cmMakefile* mf;
- cmLocalUnixMakefileGenerator3 *lg;
- if (!this->LocalGenerators.empty())
+ if (!this->Makefiles.empty())
{
- lg = static_cast<cmLocalUnixMakefileGenerator3 *>
- (this->LocalGenerators[0]);
- mf = lg->GetMakefile();
+ mf = this->Makefiles[0];
}
else
{
cmState::Snapshot snapshot = this->CMakeInstance->GetCurrentSnapshot();
mf = new cmMakefile(this, snapshot);
- lg = static_cast<cmLocalUnixMakefileGenerator3 *>
- (this->CreateLocalGenerator(mf));
// set the Start directories
- lg->GetMakefile()->SetCurrentSourceDirectory
+ mf->SetCurrentSourceDirectory
(this->CMakeInstance->GetHomeDirectory());
- lg->GetMakefile()->SetCurrentBinaryDirectory
+ mf->SetCurrentBinaryDirectory
(this->CMakeInstance->GetHomeOutputDirectory());
}
@@ -607,9 +602,8 @@ void cmGlobalUnixMakefileGenerator3
tname = conv.Convert(tname,cmOutputConverter::HOME_OUTPUT);
cmSystemTools::ConvertToOutputSlashes(tname);
makeCommand.push_back(tname);
- if (this->LocalGenerators.empty())
+ if (this->Makefiles.empty())
{
- delete lg;
delete mf;
}
}
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=61b48e70bc8d9add8b056030ebef97ffdb92512b
commit 61b48e70bc8d9add8b056030ebef97ffdb92512b
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Sep 24 09:34:53 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Sep 24 09:39:38 2015 +0200
Makefiles: Port to cmOutputConverter.
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index cf4fd69..1adc379 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -603,7 +603,8 @@ void cmGlobalUnixMakefileGenerator3
{
tname += "/fast";
}
- tname = lg->Convert(tname,cmLocalGenerator::HOME_OUTPUT);
+ cmOutputConverter conv(mf->GetStateSnapshot());
+ tname = conv.Convert(tname,cmOutputConverter::HOME_OUTPUT);
cmSystemTools::ConvertToOutputSlashes(tname);
makeCommand.push_back(tname);
if (this->LocalGenerators.empty())
-----------------------------------------------------------------------
Summary of changes:
Source/cmGlobalGenerator.cxx | 26 +++++++++++++-------------
Source/cmGlobalGenerator.h | 3 ++-
Source/cmGlobalUnixMakefileGenerator3.cxx | 19 +++++++------------
Source/cmLocalGenerator.cxx | 2 ++
Source/cmLocalGenerator.h | 3 ++-
Source/cmMakefile.cxx | 5 -----
6 files changed, 26 insertions(+), 32 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list