[Cmake-commits] CMake branch, next, updated. v3.2.2-3088-g85ad7c9
Stephen Kelly
steveire at gmail.com
Sat May 23 08:46:31 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 85ad7c9491fbefc7287fe34297493b5499486413 (commit)
via c33c7865149cea87518070028cbb41107bb2afeb (commit)
via 5ce2b7bc2440704fe3da358bc5a27d2f9de9df89 (commit)
via 775d940e37b83dfed3414cd886306675f66d1984 (commit)
via 81ccca34199c4fc2bfed287c94af08910eb06d66 (commit)
via 547dfa8b1b7551c55d320da339cd10a7f0a587a6 (commit)
from b3fe4c5ab4028294418cbb99192d8204a9a7626a (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=85ad7c9491fbefc7287fe34297493b5499486413
commit 85ad7c9491fbefc7287fe34297493b5499486413
Merge: b3fe4c5 c33c786
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat May 23 08:46:28 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat May 23 08:46:28 2015 -0400
Merge topic 'clean-up-GHS' into next
c33c7865 GHS: Don't attempt to generate for IMPORTED or INTERFACE targets.
5ce2b7bc GHS: Remove unnecessary condition.
775d940e GHS: Remove unused CustomCommandUseLocal.
81ccca34 GHS: Remove BuildFileName.
547dfa8b GHS: Remove unnecessary Configure override.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c33c7865149cea87518070028cbb41107bb2afeb
commit c33c7865149cea87518070028cbb41107bb2afeb
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat May 23 14:45:14 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat May 23 14:45:14 2015 +0200
GHS: Don't attempt to generate for IMPORTED or INTERFACE targets.
diff --git a/Source/cmLocalGhsMultiGenerator.cxx b/Source/cmLocalGhsMultiGenerator.cxx
index 9705803..025b464 100644
--- a/Source/cmLocalGhsMultiGenerator.cxx
+++ b/Source/cmLocalGhsMultiGenerator.cxx
@@ -31,6 +31,11 @@ void cmLocalGhsMultiGenerator::Generate()
for (cmGeneratorTargetsType::iterator l = tgts.begin(); l != tgts.end();
++l)
{
+ if (l->second->Target->GetType() == cmTarget::INTERFACE_LIBRARY
+ || l->second->Target->IsImported())
+ {
+ continue;
+ }
cmGhsMultiTargetGenerator tg(l->second->Target);
tg.Generate();
}
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5ce2b7bc2440704fe3da358bc5a27d2f9de9df89
commit 5ce2b7bc2440704fe3da358bc5a27d2f9de9df89
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat May 23 14:44:14 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat May 23 14:44:14 2015 +0200
GHS: Remove unnecessary condition.
diff --git a/Source/cmLocalGhsMultiGenerator.cxx b/Source/cmLocalGhsMultiGenerator.cxx
index a537265..9705803 100644
--- a/Source/cmLocalGhsMultiGenerator.cxx
+++ b/Source/cmLocalGhsMultiGenerator.cxx
@@ -27,13 +27,11 @@ cmLocalGhsMultiGenerator::~cmLocalGhsMultiGenerator() {}
void cmLocalGhsMultiGenerator::Generate()
{
cmGeneratorTargetsType tgts = this->GetMakefile()->GetGeneratorTargets();
- if (!tgts.empty())
+
+ for (cmGeneratorTargetsType::iterator l = tgts.begin(); l != tgts.end();
+ ++l)
{
- for (cmGeneratorTargetsType::iterator l = tgts.begin(); l != tgts.end();
- ++l)
- {
- cmGhsMultiTargetGenerator tg(l->second->Target);
- tg.Generate();
- }
+ cmGhsMultiTargetGenerator tg(l->second->Target);
+ tg.Generate();
}
}
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=775d940e37b83dfed3414cd886306675f66d1984
commit 775d940e37b83dfed3414cd886306675f66d1984
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat May 23 14:40:54 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat May 23 14:40:54 2015 +0200
GHS: Remove unused CustomCommandUseLocal.
This was copied from the VS generator. It is not an override of a base
class method.
diff --git a/Source/cmLocalGhsMultiGenerator.h b/Source/cmLocalGhsMultiGenerator.h
index 16b26fd..3157f11 100644
--- a/Source/cmLocalGhsMultiGenerator.h
+++ b/Source/cmLocalGhsMultiGenerator.h
@@ -33,9 +33,6 @@ public:
* Generate the makefile for this directory.
*/
virtual void Generate();
-
-protected:
- virtual bool CustomCommandUseLocal() const { return true; }
};
#endif
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=81ccca34199c4fc2bfed287c94af08910eb06d66
commit 81ccca34199c4fc2bfed287c94af08910eb06d66
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat May 23 14:39:44 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat May 23 14:39:44 2015 +0200
GHS: Remove BuildFileName.
It is never read or written.
diff --git a/Source/cmLocalGhsMultiGenerator.h b/Source/cmLocalGhsMultiGenerator.h
index 0d11315..16b26fd 100644
--- a/Source/cmLocalGhsMultiGenerator.h
+++ b/Source/cmLocalGhsMultiGenerator.h
@@ -34,13 +34,8 @@ public:
*/
virtual void Generate();
- const char *GetBuildFileName() { return this->BuildFileName.c_str(); }
-
protected:
virtual bool CustomCommandUseLocal() const { return true; }
-
-private:
- std::string BuildFileName;
};
#endif
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=547dfa8b1b7551c55d320da339cd10a7f0a587a6
commit 547dfa8b1b7551c55d320da339cd10a7f0a587a6
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat May 23 14:35:22 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat May 23 14:35:22 2015 +0200
GHS: Remove unnecessary Configure override.
This only sets a member variable which is never read. Presumably
this was copied from the makefile generator.
diff --git a/Source/cmLocalGhsMultiGenerator.cxx b/Source/cmLocalGhsMultiGenerator.cxx
index ddef3f5..a537265 100644
--- a/Source/cmLocalGhsMultiGenerator.cxx
+++ b/Source/cmLocalGhsMultiGenerator.cxx
@@ -37,21 +37,3 @@ void cmLocalGhsMultiGenerator::Generate()
}
}
}
-
-// Implemented in:
-// cmLocalGenerator.
-// Used in:
-// Source/cmMakefile.cxx
-// Source/cmGlobalGenerator.cxx
-void cmLocalGhsMultiGenerator::Configure()
-{
- // Compute the path to use when referencing the current output
- // directory from the top output directory.
- this->HomeRelativeOutputPath =
- this->Convert(this->Makefile->GetCurrentBinaryDirectory(), HOME_OUTPUT);
- if (this->HomeRelativeOutputPath == ".")
- {
- this->HomeRelativeOutputPath = "";
- }
- this->cmLocalGenerator::Configure();
-}
diff --git a/Source/cmLocalGhsMultiGenerator.h b/Source/cmLocalGhsMultiGenerator.h
index ec25cba..0d11315 100644
--- a/Source/cmLocalGhsMultiGenerator.h
+++ b/Source/cmLocalGhsMultiGenerator.h
@@ -29,20 +29,11 @@ public:
virtual ~cmLocalGhsMultiGenerator();
- /// @returns the relative path between the HomeOutputDirectory and this
- /// local generators StartOutputDirectory.
- std::string GetHomeRelativeOutputPath() const
- {
- return this->HomeRelativeOutputPath;
- }
-
/**
* Generate the makefile for this directory.
*/
virtual void Generate();
- /// Overloaded methods. @see cmLocalGenerator::Configure()
- virtual void Configure();
const char *GetBuildFileName() { return this->BuildFileName.c_str(); }
protected:
@@ -50,7 +41,6 @@ protected:
private:
std::string BuildFileName;
- std::string HomeRelativeOutputPath;
};
#endif
-----------------------------------------------------------------------
Summary of changes:
Source/cmLocalGhsMultiGenerator.cxx | 31 ++++++++-----------------------
Source/cmLocalGhsMultiGenerator.h | 18 ------------------
2 files changed, 8 insertions(+), 41 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list