diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-03-04 20:53:15 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-03-09 19:49:17 (GMT) |
| commit | b734fa44719a780683e2eb0dfaabd38d64daa3f6 (patch) | |
| tree | 55e4a63eb8ebb01ccc216b146fd5a126ea0698b1 /Source/cmGeneratorExpressionEvaluator.cxx | |
| parent | 0b945ea9a6a38d1b3ee27cc32afb4268bd571600 (diff) | |
| download | CMake-b734fa44719a780683e2eb0dfaabd38d64daa3f6.zip CMake-b734fa44719a780683e2eb0dfaabd38d64daa3f6.tar.gz CMake-b734fa44719a780683e2eb0dfaabd38d64daa3f6.tar.bz2 | |
Genex: Allow COMPILE_LANGUAGE when processing include directories.
Issue an error if this is encountered by an IDE generator.
Diffstat (limited to 'Source/cmGeneratorExpressionEvaluator.cxx')
| -rw-r--r-- | Source/cmGeneratorExpressionEvaluator.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx index 3ec8595..756d932 100644 --- a/Source/cmGeneratorExpressionEvaluator.cxx +++ b/Source/cmGeneratorExpressionEvaluator.cxx @@ -851,7 +851,8 @@ static const struct CompileLanguageNode : public cmGeneratorExpressionNode } else if (genName.find("Xcode") != std::string::npos) { - if (dagChecker && dagChecker->EvaluatingCompileDefinitions()) + if (dagChecker && (dagChecker->EvaluatingCompileDefinitions() + || dagChecker->EvaluatingIncludeDirectories())) { reportError(context, content->GetOriginalExpression(), "$<COMPILE_LANGUAGE:...> may only be used with COMPILE_OPTIONS " |