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 a3046d7e80df252fcc02c2c68130d9093074120b (commit)
via 9a8913467bd914e996151d0d8871e10852b59a49 (commit)
from 33f6e9fa0017b5c80b57ff7e86c31e96f508b91f (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=a3046d7e80df252fcc02c2c68130d9093074120b
commit a3046d7e80df252fcc02c2c68130d9093074120b
Merge: 33f6e9f 9a89134
Author: Stephen Kelly <[email protected]>
AuthorDate: Fri Sep 21 09:34:02 2012 -0400
Commit: CMake Topic Stage <[email protected]>
CommitDate: Fri Sep 21 09:34:02 2012 -0400
Merge topic 'generator-expression-target-properties' into next
9a89134 More mvp error workarounds.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9a8913467bd914e996151d0d8871e10852b59a49
commit 9a8913467bd914e996151d0d8871e10852b59a49
Author: Stephen Kelly <[email protected]>
AuthorDate: Fri Sep 21 15:31:36 2012 +0200
Commit: Stephen Kelly <[email protected]>
CommitDate: Fri Sep 21 15:31:36 2012 +0200
More mvp error workarounds.
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 81ca603..d4b57f4 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -300,7 +300,7 @@ std::vector<std::string>
cmGeneratorTarget::GetIncludeDirectories()
cmListFileBacktrace lfbt;
cmGeneratorExpression ge(lfbt);
- cmGeneratorExpressionDAGChecker dagChecker(cmListFileBacktrace(),
+ cmGeneratorExpressionDAGChecker dagChecker(lfbt,
this->GetName(),
"INCLUDE_DIRECTORIES", 0, 0);
@@ -350,7 +350,7 @@ std::string cmGeneratorTarget::GetCompileDefinitions(const
char *config)
cmListFileBacktrace lfbt;
cmGeneratorExpression ge(lfbt);
- cmGeneratorExpressionDAGChecker dagChecker(cmListFileBacktrace(),
+ cmGeneratorExpressionDAGChecker dagChecker(lfbt,
this->GetName(),
defPropName, 0, 0);
return ge.Parse(prop).Evaluate(this->Makefile,
-----------------------------------------------------------------------
Summary of changes:
Source/cmGeneratorTarget.cxx | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
[email protected]
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
