[Cmake-commits] CMake branch, next, updated. v3.3.1-2621-g9d22e55
Stephen Kelly
steveire at gmail.com
Sat Aug 29 03:39:59 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 9d22e557598eea0ccae4442d6d43b58c724219ae (commit)
via b3d2df0cb3733f8b4bebc970df89bed2724f321a (commit)
via 3b5cf7d90a2ed5294f81d9e7b2748085a69e04fb (commit)
via 0f5112eb9e189e9a5b8b946e41c825ddd6875d82 (commit)
via ec56d244512ae87e4e3e1fcf01aa0ef80ead8763 (commit)
via 1e5349a5a0162cf5f75639717d374e73358df7b2 (commit)
from 0ef3eae3a17803fcf0a4de7bf87f217da134663d (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=9d22e557598eea0ccae4442d6d43b58c724219ae
commit 9d22e557598eea0ccae4442d6d43b58c724219ae
Merge: 0ef3eae b3d2df0
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Aug 29 03:39:57 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Aug 29 03:39:57 2015 -0400
Merge topic 'refactor-compute' into next
b3d2df0c cmGlobalGenerator: Move path computation to Compute.:
3b5cf7d9 cmGlobalGenerator: Do more computation at compute time.
0f5112eb cmGeneratorTarget: Rename method to match operation.
ec56d244 cmGlobalGenerator: Process evaluation files after target depends.
1e5349a5 cmGlobalGenerator: Access makefile from makefiles container.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b3d2df0cb3733f8b4bebc970df89bed2724f321a
commit b3d2df0cb3733f8b4bebc970df89bed2724f321a
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Aug 29 09:22:09 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Aug 29 09:29:22 2015 +0200
cmGlobalGenerator: Move path computation to Compute.:
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index a440de2..2ccfc26 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1329,6 +1329,11 @@ bool cmGlobalGenerator::Compute()
return false;
}
+ for (i = 0; i < this->LocalGenerators.size(); ++i)
+ {
+ this->LocalGenerators[i]->ComputeHomeRelativeOutputPath();
+ }
+
return true;
}
@@ -1340,13 +1345,8 @@ void cmGlobalGenerator::Generate()
this->ProcessEvaluationFiles();
- for (i = 0; i < this->LocalGenerators.size(); ++i)
- {
- this->LocalGenerators[i]->ComputeHomeRelativeOutputPath();
- }
-
// Generate project files
- for (i = 0; i < this->LocalGenerators.size(); ++i)
+ for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i)
{
this->SetCurrentMakefile(this->LocalGenerators[i]->GetMakefile());
this->LocalGenerators[i]->Generate();
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3b5cf7d90a2ed5294f81d9e7b2748085a69e04fb
commit 3b5cf7d90a2ed5294f81d9e7b2748085a69e04fb
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Aug 29 09:21:32 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Aug 29 09:29:21 2015 +0200
cmGlobalGenerator: Do more computation at compute time.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index a2885c0..a440de2 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1308,13 +1308,6 @@ bool cmGlobalGenerator::Compute()
}
}
- return true;
-}
-
-void cmGlobalGenerator::Generate()
-{
- unsigned int i;
-
// Trace the dependencies, after that no custom commands should be added
// because their dependencies might not be handled correctly
for (i = 0; i < this->LocalGenerators.size(); ++i)
@@ -1333,9 +1326,14 @@ void cmGlobalGenerator::Generate()
// Compute the inter-target dependencies.
if(!this->ComputeTargetDepends())
{
- return;
+ return false;
}
+ return true;
+}
+
+void cmGlobalGenerator::Generate()
+{
// Create a map from local generator to the complete set of targets
// it builds by default.
this->InitializeProgressMarks();
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0f5112eb9e189e9a5b8b946e41c825ddd6875d82
commit 0f5112eb9e189e9a5b8b946e41c825ddd6875d82
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Aug 25 08:25:12 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Aug 29 09:28:06 2015 +0200
cmGeneratorTarget: Rename method to match operation.
The manifest is computed, not generated, according to current language
used in cmake method naming.
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 4a1a7a2..09387b7 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -2554,7 +2554,7 @@ void cmGeneratorTarget::GetCompileDefinitions(std::vector<std::string> &list,
}
//----------------------------------------------------------------------------
-void cmGeneratorTarget::GenerateTargetManifest(
+void cmGeneratorTarget::ComputeTargetManifest(
const std::string& config) const
{
if (this->Target->IsImported())
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 2c8467f..06d9a1f 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -251,7 +251,7 @@ public:
const std::string& config) const;
/** Add the target output files to the global generator manifest. */
- void GenerateTargetManifest(const std::string& config) const;
+ void ComputeTargetManifest(const std::string& config) const;
/**
* Trace through the source files in this target and add al source files
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index e6cbce3..a2885c0 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1327,7 +1327,7 @@ void cmGlobalGenerator::Generate()
// Compute the manifest of main targets generated.
for (i = 0; i < this->LocalGenerators.size(); ++i)
{
- this->LocalGenerators[i]->GenerateTargetManifest();
+ this->LocalGenerators[i]->ComputeTargetManifest();
}
// Compute the inter-target dependencies.
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 7ce4819..f73e12f 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -450,7 +450,7 @@ void cmLocalGenerator::GenerateInstallRules()
}
//----------------------------------------------------------------------------
-void cmLocalGenerator::GenerateTargetManifest()
+void cmLocalGenerator::ComputeTargetManifest()
{
// Collect the set of configuration types.
std::vector<std::string> configNames;
@@ -478,7 +478,7 @@ void cmLocalGenerator::GenerateTargetManifest()
ci != configNames.end(); ++ci)
{
const char* config = ci->c_str();
- target.GenerateTargetManifest(config);
+ target.ComputeTargetManifest(config);
}
}
}
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 915814b..2f0971e 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -67,7 +67,7 @@ public:
/**
* Generate a manifest of target files that will be built.
*/
- void GenerateTargetManifest();
+ void ComputeTargetManifest();
///! Get the makefile for this generator
cmMakefile *GetMakefile() {
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ec56d244512ae87e4e3e1fcf01aa0ef80ead8763
commit ec56d244512ae87e4e3e1fcf01aa0ef80ead8763
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Aug 29 09:18:01 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Aug 29 09:18:01 2015 +0200
cmGlobalGenerator: Process evaluation files after target depends.
No need to generate the files if computation aborts generation.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 97fa823..e6cbce3 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1330,8 +1330,6 @@ void cmGlobalGenerator::Generate()
this->LocalGenerators[i]->GenerateTargetManifest();
}
- this->ProcessEvaluationFiles();
-
// Compute the inter-target dependencies.
if(!this->ComputeTargetDepends())
{
@@ -1342,6 +1340,8 @@ void cmGlobalGenerator::Generate()
// it builds by default.
this->InitializeProgressMarks();
+ this->ProcessEvaluationFiles();
+
for (i = 0; i < this->LocalGenerators.size(); ++i)
{
this->LocalGenerators[i]->ComputeHomeRelativeOutputPath();
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1e5349a5a0162cf5f75639717d374e73358df7b2
commit 1e5349a5a0162cf5f75639717d374e73358df7b2
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Aug 25 08:21:22 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Aug 29 09:15:37 2015 +0200
cmGlobalGenerator: Access makefile from makefiles container.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 46c1ccc..97fa823 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1669,8 +1669,7 @@ void cmGlobalGenerator::CheckLocalGenerators()
text += "\n linked by target \"";
text += l->second.GetName();
text += "\" in directory ";
- text+=this->LocalGenerators[i]->GetMakefile()
- ->GetCurrentSourceDirectory();
+ text+=this->Makefiles[i]->GetCurrentSourceDirectory();
notFoundMap[varName] = text;
}
}
-----------------------------------------------------------------------
Summary of changes:
Source/cmGeneratorTarget.cxx | 2 +-
Source/cmGeneratorTarget.h | 2 +-
Source/cmGlobalGenerator.cxx | 33 +++++++++++++++------------------
Source/cmLocalGenerator.cxx | 4 ++--
Source/cmLocalGenerator.h | 2 +-
5 files changed, 20 insertions(+), 23 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list