summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-11-17 16:43:19 (GMT)
committerBrad King <brad.king@kitware.com>2017-11-17 16:56:00 (GMT)
commit0f6f7c8ab1979b89c4400ebab39532be4bc269fb (patch)
treefc3161913b67be1cd457c5977cb66bafc57da18f /Source
parentc5a82d0f883b4e8f34c380117316d3fa1a97c3d2 (diff)
downloadCMake-0f6f7c8ab1979b89c4400ebab39532be4bc269fb.zip
CMake-0f6f7c8ab1979b89c4400ebab39532be4bc269fb.tar.gz
CMake-0f6f7c8ab1979b89c4400ebab39532be4bc269fb.tar.bz2
Genex: Fix COMPILE_LANGUAGE messages to allow file(GENERATE) with Xcode
When rejecting the `COMPILE_LANGUAGE` generator expression on include directories and compile definitions with Xcode, add `file(GENERATE)` to the allowed set in the message. It is allowed and already covered by the `RunCMake.File_Generate` test `COMPILE_LANGUAGE-genex` case.
Diffstat (limited to 'Source')
-rw-r--r--Source/cmGeneratorExpressionNode.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 7fe0cbe..488bbfd 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -838,8 +838,8 @@ static const struct CompileLanguageNode : public cmGeneratorExpressionNode
dagChecker->EvaluatingIncludeDirectories())) {
reportError(
context, content->GetOriginalExpression(),
- "$<COMPILE_LANGUAGE:...> may only be used with COMPILE_OPTIONS "
- "with the Xcode generator.");
+ "$<COMPILE_LANGUAGE:...> may only be used for COMPILE_OPTIONS "
+ "and file(GENERATE) with the Xcode generator.");
return std::string();
}
} else {