diff options
| author | Brad King <brad.king@kitware.com> | 2019-02-13 13:39:57 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-02-13 13:40:04 (GMT) |
| commit | 122946def94e15cc2b6941197ac0cf3d92815206 (patch) | |
| tree | 4a145f6a303634d98a166375322395bd9f3d89d5 /Source/cmGeneratorExpressionNode.cxx | |
| parent | 99ec095d9ddc6c2a8f073d38e14da66d1a245f80 (diff) | |
| parent | e429e9af4259f924f4f8329f9f994e2f6a6e824a (diff) | |
| download | CMake-122946def94e15cc2b6941197ac0cf3d92815206.zip CMake-122946def94e15cc2b6941197ac0cf3d92815206.tar.gz CMake-122946def94e15cc2b6941197ac0cf3d92815206.tar.bz2 | |
Merge topic 'genex-GENEX_EVAL-fix-recursion'
e429e9af42 genex: Fix erroneous handling of recursion for $<GENEX_EVAL:>
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: yrHeTaTeJlb <jjj.bo@yandex.ru>
Merge-request: !2954
Diffstat (limited to 'Source/cmGeneratorExpressionNode.cxx')
| -rw-r--r-- | Source/cmGeneratorExpressionNode.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx index dcec0a4..49a5fcd 100644 --- a/Source/cmGeneratorExpressionNode.cxx +++ b/Source/cmGeneratorExpressionNode.cxx @@ -402,8 +402,8 @@ protected: { if (context->HeadTarget) { cmGeneratorExpressionDAGChecker dagChecker( - context->Backtrace, context->HeadTarget, genexOperator, content, - dagCheckerParent); + context->Backtrace, context->HeadTarget, + genexOperator + ":" + expression, content, dagCheckerParent); switch (dagChecker.Check()) { case cmGeneratorExpressionDAGChecker::SELF_REFERENCE: case cmGeneratorExpressionDAGChecker::CYCLIC_REFERENCE: { |