diff options
author | Brad King <brad.king@kitware.com> | 2017-08-04 13:17:19 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2017-08-04 13:17:24 (GMT) |
commit | 51f08783c2982c55c86b0d2d04bfbbf81bfbc815 (patch) | |
tree | 725dbedc4ed942f0b4b01e06e6a1e5421ecb68f3 /Source | |
parent | b745cb3e55298ab7d899e94ef2a89a59035874cb (diff) | |
parent | e49c9eec276986756c084b05c473c1a8ce62bcd5 (diff) | |
download | CMake-51f08783c2982c55c86b0d2d04bfbbf81bfbc815.zip CMake-51f08783c2982c55c86b0d2d04bfbbf81bfbc815.tar.gz CMake-51f08783c2982c55c86b0d2d04bfbbf81bfbc815.tar.bz2 |
Merge topic 'genex-error-grammar'
e49c9eec cmGeneratorExpressionNode: add some missing commas
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1102
Diffstat (limited to 'Source')
-rw-r--r-- | Source/cmGeneratorExpressionNode.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx index a57d2a0..4d2e5c7 100644 --- a/Source/cmGeneratorExpressionNode.cxx +++ b/Source/cmGeneratorExpressionNode.cxx @@ -813,7 +813,7 @@ static const struct CompileLanguageNode : public cmGeneratorExpressionNode reportError( context, content->GetOriginalExpression(), "$<COMPILE_LANGUAGE:...> may only be used to specify include " - "directories compile definitions, compile options and to evaluate " + "directories, compile definitions, compile options, and to evaluate " "components of the file(GENERATE) command."); return std::string(); } |