[Cmake-commits] CMake branch, next, updated. v3.2.2-3109-gc235129
Stephen Kelly
steveire at gmail.com
Sun May 24 07:30:18 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 c23512967704403b91a7887da97153cd50b6f70a (commit)
via f69dcdfc380176a2c4365357c1ca85c0444087b0 (commit)
via a4d230af7d594b7bc2a047468da7849c27438237 (commit)
via 550e08b012a67a20d4c71cb9e0b3aafadd265012 (commit)
via d34467cd5843bc2ceb7cbde288c6cb0d8e2188ca (commit)
via 9afc9e847893ff49e4085ef55f59d62119b58026 (commit)
via 73245e591109c38712d5aa91bee655de70e8456a (commit)
from 9f5730d181bf686e829b4d322eb9763cd7914609 (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=c23512967704403b91a7887da97153cd50b6f70a
commit c23512967704403b91a7887da97153cd50b6f70a
Merge: 9f5730d f69dcdf
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun May 24 07:30:17 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun May 24 07:30:17 2015 -0400
Merge topic 'clean-up-GHS' into next
f69dcdfc GHS: Remove call to SetCurrentLocalGenerator.
a4d230af GHS: Don't attempt to generate for IMPORTED or INTERFACE targets.
550e08b0 GHS: Remove unnecessary condition.
d34467cd GHS: Remove unused CustomCommandUseLocal.
9afc9e84 GHS: Remove BuildFileName.
73245e59 GHS: Remove unnecessary Configure override.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f69dcdfc380176a2c4365357c1ca85c0444087b0
commit f69dcdfc380176a2c4365357c1ca85c0444087b0
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun May 24 11:10:58 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sun May 24 13:29:48 2015 +0200
GHS: Remove call to SetCurrentLocalGenerator.
It is not needed as cmLocalGenerator::Configure does this.
diff --git a/Source/cmGlobalGhsMultiGenerator.cxx b/Source/cmGlobalGhsMultiGenerator.cxx
index d6bf75c..12e64d5 100644
--- a/Source/cmGlobalGhsMultiGenerator.cxx
+++ b/Source/cmGlobalGhsMultiGenerator.cxx
@@ -35,9 +35,7 @@ cmGlobalGhsMultiGenerator::~cmGlobalGhsMultiGenerator()
cmLocalGenerator *
cmGlobalGhsMultiGenerator::CreateLocalGenerator(cmLocalGenerator* parent)
{
- cmLocalGenerator *lg = new cmLocalGhsMultiGenerator(this, parent);
- this->SetCurrentLocalGenerator(lg);
- return lg;
+ return new cmLocalGhsMultiGenerator(this, parent);
}
void cmGlobalGhsMultiGenerator::GetDocumentation(cmDocumentationEntry &entry)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a4d230af7d594b7bc2a047468da7849c27438237
commit a4d230af7d594b7bc2a047468da7849c27438237
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat May 23 14:45:14 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sun May 24 13:29:48 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=550e08b012a67a20d4c71cb9e0b3aafadd265012
commit 550e08b012a67a20d4c71cb9e0b3aafadd265012
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat May 23 14:44:14 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sun May 24 13:29:48 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=d34467cd5843bc2ceb7cbde288c6cb0d8e2188ca
commit d34467cd5843bc2ceb7cbde288c6cb0d8e2188ca
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat May 23 14:40:54 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sun May 24 13:29:48 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=9afc9e847893ff49e4085ef55f59d62119b58026
commit 9afc9e847893ff49e4085ef55f59d62119b58026
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat May 23 14:39:44 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sun May 24 13:29:48 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=73245e591109c38712d5aa91bee655de70e8456a
commit 73245e591109c38712d5aa91bee655de70e8456a
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat May 23 14:35:22 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sun May 24 13:29:48 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:
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list