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 772e19214951cd767510ff2a464e9ffb5b5e220c (commit)
via 616d8f02d53b9a0c2ec5c85a6b1afc17081d1e2e (commit)
from 0e79b982a0066b31aa19fe942827d7967a51571f (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=772e19214951cd767510ff2a464e9ffb5b5e220c
commit 772e19214951cd767510ff2a464e9ffb5b5e220c
Merge: 0e79b98 616d8f0
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Sun Aug 30 05:40:01 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Sun Aug 30 05:40:01 2015 -0400
Merge topic 'refactor-compute' into next
616d8f02 cmGeneratorTarget: Rename method to match operation.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=616d8f02d53b9a0c2ec5c85a6b1afc17081d1e2e
commit 616d8f02d53b9a0c2ec5c85a6b1afc17081d1e2e
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Tue Aug 25 08:25:12 2015 +0200
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Sun Aug 30 11:39:52 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() {
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
