diff options
| author | Brad King <brad.king@kitware.com> | 2014-05-30 18:51:41 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-05-30 18:51:41 (GMT) |
| commit | 060c86a5062202a3900d6eac4dcd128986c0ff83 (patch) | |
| tree | c70dfc89fa3221be014c2ef92fb3f59ddc9e7797 /Source | |
| parent | c4a26b70cbaa1708b3ad28f2d09976fd7b1c925e (diff) | |
| parent | fb2fa4765611bbf94fdf63a50ff20c5905d34057 (diff) | |
| download | CMake-060c86a5062202a3900d6eac4dcd128986c0ff83.zip CMake-060c86a5062202a3900d6eac4dcd128986c0ff83.tar.gz CMake-060c86a5062202a3900d6eac4dcd128986c0ff83.tar.bz2 | |
Merge topic 'consistent-genex-target-message'
fb2fa476 Genex: Clarify error message on use with non-binary targets (#14899).
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGeneratorExpressionEvaluator.cxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx index 0b357f6..a15e3ff 100644 --- a/Source/cmGeneratorExpressionEvaluator.cxx +++ b/Source/cmGeneratorExpressionEvaluator.cxx @@ -457,8 +457,8 @@ static const struct CCompilerIdNode : public CompilerIdNode if (!context->HeadTarget) { reportError(context, content->GetOriginalExpression(), - "$<C_COMPILER_ID> may only be used with targets. It may not " - "be used with add_custom_command."); + "$<C_COMPILER_ID> may only be used with binary targets. It may " + "not be used with add_custom_command or add_custom_target."); return std::string(); } return this->EvaluateWithLanguage(parameters, context, content, @@ -479,8 +479,8 @@ static const struct CXXCompilerIdNode : public CompilerIdNode if (!context->HeadTarget) { reportError(context, content->GetOriginalExpression(), - "$<CXX_COMPILER_ID> may only be used with targets. It may not " - "be used with add_custom_command."); + "$<CXX_COMPILER_ID> may only be used with binary targets. It may " + "not be used with add_custom_command or add_custom_target."); return std::string(); } return this->EvaluateWithLanguage(parameters, context, content, @@ -541,8 +541,8 @@ static const struct CCompilerVersionNode : public CompilerVersionNode if (!context->HeadTarget) { reportError(context, content->GetOriginalExpression(), - "$<C_COMPILER_VERSION> may only be used with targets. It may not " - "be used with add_custom_command."); + "$<C_COMPILER_VERSION> may only be used with binary targets. It " + "may not be used with add_custom_command or add_custom_target."); return std::string(); } return this->EvaluateWithLanguage(parameters, context, content, @@ -563,8 +563,8 @@ static const struct CxxCompilerVersionNode : public CompilerVersionNode if (!context->HeadTarget) { reportError(context, content->GetOriginalExpression(), - "$<CXX_COMPILER_VERSION> may only be used with targets. It may " - "not be used with add_custom_command."); + "$<CXX_COMPILER_VERSION> may only be used with binary targets. It " + "may not be used with add_custom_command or add_custom_target."); return std::string(); } return this->EvaluateWithLanguage(parameters, context, content, @@ -893,10 +893,10 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode if (!target && parameters.size() == 1) { reportError(context, content->GetOriginalExpression(), - "$<TARGET_PROPERTY:prop> may only be used with targets. It may not " - "be used with add_custom_command. Specify the target to read a " - "property from using the $<TARGET_PROPERTY:tgt,prop> signature " - "instead."); + "$<TARGET_PROPERTY:prop> may only be used with binary targets. " + "It may not be used with add_custom_command or add_custom_target. " + "Specify the target to read a property from using the " + "$<TARGET_PROPERTY:tgt,prop> signature instead."); return std::string(); } @@ -1460,8 +1460,8 @@ static const struct TargetPolicyNode : public cmGeneratorExpressionNode if (!context->HeadTarget) { reportError(context, content->GetOriginalExpression(), - "$<TARGET_POLICY:prop> may only be used with targets. It may not " - "be used with add_custom_command."); + "$<TARGET_POLICY:prop> may only be used with binary targets. It " + "may not be used with add_custom_command or add_custom_target."); return std::string(); } |