diff options
| author | Stephen Kelly <steveire@gmail.com> | 2013-06-14 13:59:23 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2013-06-24 14:21:53 (GMT) |
| commit | b1c19ce3837036bde3b639f8285fa228b8e6f278 (patch) | |
| tree | 3c6fa9415dcfd4e6232a926072f7ca4f4db752c6 /Source/cmGeneratorExpressionEvaluator.cxx | |
| parent | 0e1cb07e841c5ca9207bc4e32ff0672476226cc0 (diff) | |
| download | CMake-b1c19ce3837036bde3b639f8285fa228b8e6f278.zip CMake-b1c19ce3837036bde3b639f8285fa228b8e6f278.tar.gz CMake-b1c19ce3837036bde3b639f8285fa228b8e6f278.tar.bz2 | |
Genex: Make LINK_LANGUAGE report an error when evaluating link libraries.
Diffstat (limited to 'Source/cmGeneratorExpressionEvaluator.cxx')
| -rw-r--r-- | Source/cmGeneratorExpressionEvaluator.cxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx index 3e18bba..cd0d26b 100644 --- a/Source/cmGeneratorExpressionEvaluator.cxx +++ b/Source/cmGeneratorExpressionEvaluator.cxx @@ -415,8 +415,15 @@ static const struct LinkLanguageNode : public cmGeneratorExpressionNode std::string Evaluate(const std::vector<std::string> ¶meters, cmGeneratorExpressionContext *context, const GeneratorExpressionContent *content, - cmGeneratorExpressionDAGChecker *) const + cmGeneratorExpressionDAGChecker *dagChecker) const { + if (dagChecker && dagChecker->EvaluatingLinkLibraries()) + { + reportError(context, content->GetOriginalExpression(), + "$<LINK_LANGUAGE> expression can not be used while evaluating " + "link libraries"); + return std::string(); + } if (parameters.size() != 0 && parameters.size() != 1) { reportError(context, content->GetOriginalExpression(), |