diff options
| author | Brad King <brad.king@kitware.com> | 2019-01-15 18:11:23 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-01-15 18:12:08 (GMT) |
| commit | b2084a330d73f92b7d55d22921b2e2d9e1d462cc (patch) | |
| tree | 1b38b33e138726bd342af77a2f36b6c702f26d80 /Source | |
| parent | 5d3b8eed4bf7d4b4b2534861aa96f517479596af (diff) | |
| parent | 6845e2559d66be8d2c67d936ca597ade05b4ebbc (diff) | |
| download | CMake-b2084a330d73f92b7d55d22921b2e2d9e1d462cc.zip CMake-b2084a330d73f92b7d55d22921b2e2d9e1d462cc.tar.gz CMake-b2084a330d73f92b7d55d22921b2e2d9e1d462cc.tar.bz2 | |
Merge topic 'deprecate-policy-old'
6845e2559d Add deprecation warnings for policies CMP0065 and below
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2793
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmMakefile.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 68a5101..891ca61 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -4232,7 +4232,11 @@ bool cmMakefile::SetPolicy(cmPolicies::PolicyID id, // Deprecate old policies, especially those that require a lot // of code to maintain the old behavior. - if (status == cmPolicies::OLD && id <= cmPolicies::CMP0063) { + if (status == cmPolicies::OLD && id <= cmPolicies::CMP0065 && + !(this->GetCMakeInstance()->GetIsInTryCompile() && + ( + // Policies set by cmCoreTryCompile::TryCompileCode. + id == cmPolicies::CMP0065))) { this->IssueMessage(cmake::DEPRECATION_WARNING, cmPolicies::GetPolicyDeprecatedWarning(id)); } |