|
@@ -4470,12 +4470,12 @@ bool cmMakefile::SetPolicy(cmPolicies::PolicyID id,
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// Deprecate old policies.
|
|
// Deprecate old policies.
|
|
|
- if (status == cmPolicies::OLD && id <= cmPolicies::CMP0102 &&
|
|
|
|
|
|
|
+ if (status == cmPolicies::OLD && id <= cmPolicies::CMP0108 &&
|
|
|
!(this->GetCMakeInstance()->GetIsInTryCompile() &&
|
|
!(this->GetCMakeInstance()->GetIsInTryCompile() &&
|
|
|
(
|
|
(
|
|
|
// Policies set by cmCoreTryCompile::TryCompileCode.
|
|
// Policies set by cmCoreTryCompile::TryCompileCode.
|
|
|
id == cmPolicies::CMP0065 || id == cmPolicies::CMP0083 ||
|
|
id == cmPolicies::CMP0065 || id == cmPolicies::CMP0083 ||
|
|
|
- id == cmPolicies::CMP0091)) &&
|
|
|
|
|
|
|
+ id == cmPolicies::CMP0091 || id == cmPolicies::CMP0104)) &&
|
|
|
(!this->IsSet("CMAKE_WARN_DEPRECATED") ||
|
|
(!this->IsSet("CMAKE_WARN_DEPRECATED") ||
|
|
|
this->IsOn("CMAKE_WARN_DEPRECATED"))) {
|
|
this->IsOn("CMAKE_WARN_DEPRECATED"))) {
|
|
|
this->IssueMessage(MessageType::DEPRECATION_WARNING,
|
|
this->IssueMessage(MessageType::DEPRECATION_WARNING,
|