diff options
| author | Stephen Kelly <steveire@gmail.com> | 2012-11-20 13:53:41 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-01-23 19:15:41 (GMT) |
| commit | e3b5eb6b23e5d2b6034e1c13716abb73ab6b3397 (patch) | |
| tree | 835263e83ceabd38952b943b25d83a6efb0cf78d /Source/cmGeneratorExpressionEvaluator.cxx | |
| parent | 6c8d8afe344aa2e0ba0c5c881d397a28a559dcbd (diff) | |
| download | CMake-e3b5eb6b23e5d2b6034e1c13716abb73ab6b3397.zip CMake-e3b5eb6b23e5d2b6034e1c13716abb73ab6b3397.tar.gz CMake-e3b5eb6b23e5d2b6034e1c13716abb73ab6b3397.tar.bz2 | |
Automatically link to the qtmain library when linking to QtCore.
When using QAxServer, ensure that the qtmain library is excluded
by reporting an error at CMake time if it is not.
Diffstat (limited to 'Source/cmGeneratorExpressionEvaluator.cxx')
| -rw-r--r-- | Source/cmGeneratorExpressionEvaluator.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx index 2ddc058..c791977 100644 --- a/Source/cmGeneratorExpressionEvaluator.cxx +++ b/Source/cmGeneratorExpressionEvaluator.cxx @@ -492,6 +492,7 @@ static const char* targetPolicyWhitelist[] = { "CMP0003" , "CMP0004" , "CMP0008" + , "CMP0020" }; cmPolicies::PolicyStatus statusForTarget(cmTarget *tgt, const char *policy) @@ -505,6 +506,7 @@ cmPolicies::PolicyStatus statusForTarget(cmTarget *tgt, const char *policy) RETURN_POLICY(CMP0003) RETURN_POLICY(CMP0004) RETURN_POLICY(CMP0008) + RETURN_POLICY(CMP0020) #undef RETURN_POLICY @@ -523,6 +525,7 @@ cmPolicies::PolicyID policyForString(const char *policy_id) RETURN_POLICY_ID(CMP0003) RETURN_POLICY_ID(CMP0004) RETURN_POLICY_ID(CMP0008) + RETURN_POLICY_ID(CMP0020) #undef RETURN_POLICY_ID @@ -575,8 +578,8 @@ static const struct TargetPolicyNode : public cmGeneratorExpressionNode } reportError(context, content->GetOriginalExpression(), "$<TARGET_POLICY:prop> may only be used with a limited number of " - "policies. Currently it may be used with policies CMP0003, CMP0004 " - "and CMP0008." + "policies. Currently it may be used with policies CMP0003, CMP0004, " + "CMP0008 and CMP0020." ); return std::string(); } |