diff options
| author | Brad King <brad.king@kitware.com> | 2021-07-01 15:27:25 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-07-01 15:27:31 (GMT) |
| commit | a10ca7f6679eb7a8c24127b5481de6dc4f2bbeb7 (patch) | |
| tree | 60d0690429a991f09b97d632038c066fb139941c /Source/cmMakefile.cxx | |
| parent | 3a6cb03b6ce0322ddd12fadaa37f76a5ae670db2 (diff) | |
| parent | 2c209097b9c29aae4ed2bd414e5c48fe6f4e148e (diff) | |
| download | CMake-a10ca7f6679eb7a8c24127b5481de6dc4f2bbeb7.zip CMake-a10ca7f6679eb7a8c24127b5481de6dc4f2bbeb7.tar.gz CMake-a10ca7f6679eb7a8c24127b5481de6dc4f2bbeb7.tar.bz2 | |
Merge topic 'post-rel-dev'
2c209097b9 Configure CMake itself with policies through CMake 3.20
83a3db5631 export: Increase maximum policy version in exported files to 3.20
d76cb12905 Add deprecation warnings for policies CMP0088 and below
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6290
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index c970abe..a2d64e2 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -4426,13 +4426,12 @@ bool cmMakefile::SetPolicy(cmPolicies::PolicyID id, return false; } - // Deprecate old policies, especially those that require a lot - // of code to maintain the old behavior. - if (status == cmPolicies::OLD && id <= cmPolicies::CMP0081 && + // Deprecate old policies. + if (status == cmPolicies::OLD && id <= cmPolicies::CMP0088 && !(this->GetCMakeInstance()->GetIsInTryCompile() && ( // Policies set by cmCoreTryCompile::TryCompileCode. - id == cmPolicies::CMP0065))) { + id == cmPolicies::CMP0065 || id == cmPolicies::CMP0083))) { this->IssueMessage(MessageType::DEPRECATION_WARNING, cmPolicies::GetPolicyDeprecatedWarning(id)); } |