[Cmake-commits] CMake branch, next, updated. v3.3.0-1849-gc783951
Brad King
brad.king at kitware.com
Tue Aug 4 09:49:05 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 c783951c1fa1f6508145a845b0a00b2d1b17eeb0 (commit)
via 133ea6a940d698a75c118c5d3e7350c472f6e8fb (commit)
via 5cc55b9331b7b8844c331657ac60c3293dce9fc3 (commit)
from 176546cf838362e249598060cedf57d1365940f4 (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=c783951c1fa1f6508145a845b0a00b2d1b17eeb0
commit c783951c1fa1f6508145a845b0a00b2d1b17eeb0
Merge: 176546c 133ea6a
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 4 09:49:04 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 4 09:49:04 2015 -0400
Merge topic 'use-generator-target' into next
133ea6a9 Revert "cmGlobalGenerator: Base exclusion computation on cmGeneratorTarget."
5cc55b93 Revert "cmMakefile: Remove unused method."
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=133ea6a940d698a75c118c5d3e7350c472f6e8fb
commit 133ea6a940d698a75c118c5d3e7350c472f6e8fb
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 4 09:32:42 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Aug 4 09:33:33 2015 -0400
Revert "cmGlobalGenerator: Base exclusion computation on cmGeneratorTarget."
This reverts commit ffc27b83b4f3a31c1c38cdc7edc8a6d37ed1977d.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index b14949a..1d6608b 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2022,10 +2022,10 @@ bool cmGlobalGenerator::IsExcluded(cmLocalGenerator* root,
}
bool cmGlobalGenerator::IsExcluded(cmLocalGenerator* root,
- cmGeneratorTarget* target) const
+ cmTarget const& target) const
{
- if(target->GetType() == cmTarget::INTERFACE_LIBRARY
- || target->Target->GetPropertyAsBool("EXCLUDE_FROM_ALL"))
+ if(target.GetType() == cmTarget::INTERFACE_LIBRARY
+ || target.GetPropertyAsBool("EXCLUDE_FROM_ALL"))
{
// This target is excluded from its directory.
return true;
@@ -2034,7 +2034,7 @@ bool cmGlobalGenerator::IsExcluded(cmLocalGenerator* root,
{
// This target is included in its directory. Check whether the
// directory is excluded.
- return this->IsExcluded(root, target->GetLocalGenerator());
+ return this->IsExcluded(root, target.GetMakefile()->GetLocalGenerator());
}
}
@@ -2095,16 +2095,15 @@ void cmGlobalGenerator::FillLocalGeneratorToTargetMap()
{
cmTarget const& target = t->second;
- cmGeneratorTarget* gt = this->GetGeneratorTarget(&target);
-
// Consider the directory containing the target and all its
// parents until something excludes the target.
- for(cmLocalGenerator* clg = lg; clg && !this->IsExcluded(clg, gt);
+ for(cmLocalGenerator* clg = lg; clg && !this->IsExcluded(clg, target);
clg = clg->GetParent())
{
// This local generator includes the target.
std::set<cmGeneratorTarget const*>& targetSet =
this->LocalGeneratorToTargetMap[clg];
+ cmGeneratorTarget* gt = this->GetGeneratorTarget(&target);
targetSet.insert(gt);
// Add dependencies of the included target. An excluded
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 3be76b6..9492372 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -398,7 +398,7 @@ protected:
void FillProjectMap();
void CheckLocalGenerators();
bool IsExcluded(cmLocalGenerator* root, cmLocalGenerator* gen) const;
- bool IsExcluded(cmLocalGenerator* root, cmGeneratorTarget* target) const;
+ bool IsExcluded(cmLocalGenerator* root, cmTarget const& target) const;
void FillLocalGeneratorToTargetMap();
void CreateDefaultGlobalTargets(cmTargets* targets);
cmTarget CreateGlobalTarget(const std::string& name, const char* message,
diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h
index 47822b4..2a749c1 100644
--- a/Source/cmGlobalNinjaGenerator.h
+++ b/Source/cmGlobalNinjaGenerator.h
@@ -289,7 +289,7 @@ public:
const std::vector<cmLocalGenerator*>& GetLocalGenerators() const {
return LocalGenerators; }
- bool IsExcluded(cmLocalGenerator* root, cmGeneratorTarget* target) {
+ bool IsExcluded(cmLocalGenerator* root, cmTarget& target) {
return cmGlobalGenerator::IsExcluded(root, target); }
int GetRuleCmdLength(const std::string& name) {
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 76d059ee..69747a4 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -821,7 +821,7 @@ cmGlobalUnixMakefileGenerator3
localName, depends, commands, true);
// add the all/all dependency
- if(!this->IsExcluded(this->LocalGenerators[0], gtarget))
+ if(!this->IsExcluded(this->LocalGenerators[0], *gtarget->Target))
{
depends.clear();
depends.push_back(localName);
@@ -889,7 +889,7 @@ cmGlobalUnixMakefileGenerator3
"Pre-install relink rule for target.",
localName, depends, commands, true);
- if(!this->IsExcluded(this->LocalGenerators[0], gtarget))
+ if(!this->IsExcluded(this->LocalGenerators[0], *gtarget->Target))
{
depends.clear();
depends.push_back(localName);
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index c06dfb3..2f9d79a 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -111,18 +111,17 @@ bool cmGlobalVisualStudioGenerator::Compute()
for(std::vector<cmLocalGenerator*>::iterator i = gen.begin();
i != gen.end(); ++i)
{
- cmGeneratorTargetsType targets =
- (*i)->GetMakefile()->GetGeneratorTargets();
- for(cmGeneratorTargetsType::iterator t = targets.begin();
+ cmTargets& targets = (*i)->GetMakefile()->GetTargets();
+ for(cmTargets::iterator t = targets.begin();
t != targets.end(); ++t)
{
- if (t->second->GetType() == cmTarget::GLOBAL_TARGET)
+ if (t->second.GetType() == cmTarget::GLOBAL_TARGET)
{
continue;
}
if(!this->IsExcluded(gen[0], t->second))
{
- allBuild->AddUtility(t->second->GetName());
+ allBuild->AddUtility(t->second.GetName());
}
}
}
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index 1822c97..9889bd4 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -90,7 +90,7 @@ void cmLocalNinjaGenerator::Generate()
// Add the target to "all" if required.
if (!this->GetGlobalNinjaGenerator()->IsExcluded(
this->GetGlobalNinjaGenerator()->GetLocalGenerators()[0],
- t->second))
+ *t->second->Target))
this->GetGlobalNinjaGenerator()->AddDependencyToAll(t->second->Target);
delete tg;
}
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5cc55b9331b7b8844c331657ac60c3293dce9fc3
commit 5cc55b9331b7b8844c331657ac60c3293dce9fc3
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 4 09:33:19 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Aug 4 09:33:31 2015 -0400
Revert "cmMakefile: Remove unused method."
This reverts commit 968e1ca548746ff92770c11ec5e524af548f4419.
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 00d4005..1e5c301 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -113,6 +113,10 @@ public:
bool GetIsSourceFileTryCompile() const;
+ ///! Get the current makefile generator.
+ cmLocalGenerator* GetLocalGenerator() const
+ { return this->LocalGenerator;}
+
/**
* Help enforce global target name uniqueness.
*/
-----------------------------------------------------------------------
Summary of changes:
Source/cmGlobalGenerator.cxx | 13 ++++++-------
Source/cmGlobalGenerator.h | 2 +-
Source/cmGlobalNinjaGenerator.h | 2 +-
Source/cmGlobalUnixMakefileGenerator3.cxx | 4 ++--
Source/cmGlobalVisualStudioGenerator.cxx | 9 ++++-----
Source/cmLocalNinjaGenerator.cxx | 2 +-
Source/cmMakefile.h | 4 ++++
7 files changed, 19 insertions(+), 17 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list