diff options
| author | Brad King <brad.king@kitware.com> | 2022-10-13 13:55:07 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-10-13 13:55:15 (GMT) |
| commit | ba8f393f78cda4801f074e27de788fb191b43fab (patch) | |
| tree | ed127fa4119fceca738578f2244cd8a98c5c64cb /Source | |
| parent | 07f34704d3b883f0f5381c759833e8deafd3a9a2 (diff) | |
| parent | 5f998bbcb3242a2d464843640d090cccbc05d814 (diff) | |
| download | CMake-ba8f393f78cda4801f074e27de788fb191b43fab.zip CMake-ba8f393f78cda4801f074e27de788fb191b43fab.tar.gz CMake-ba8f393f78cda4801f074e27de788fb191b43fab.tar.bz2 | |
Merge topic 'post-rel-dev'
5f998bbcb3 Configure CMake itself with policies through CMake 3.24
6bd18eed8e export: Increase maximum policy version in exported files to 3.24
c0e8bb5150 Add deprecation warnings for policies CMP0108 and below
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7786
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmExportFileGenerator.cxx | 4 | ||||
| -rw-r--r-- | Source/cmMakefile.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx index 50bc78c..2c61163 100644 --- a/Source/cmExportFileGenerator.cxx +++ b/Source/cmExportFileGenerator.cxx @@ -939,13 +939,13 @@ void cmExportFileGenerator::GeneratePolicyHeaderCode(std::ostream& os) // Isolate the file policy level. // Support CMake versions as far back as 2.6 but also support using NEW - // policy settings for up to CMake 3.23 (this upper limit may be reviewed + // policy settings for up to CMake 3.24 (this upper limit may be reviewed // and increased from time to time). This reduces the opportunity for CMake // warnings when an older export file is later used with newer CMake // versions. /* clang-format off */ os << "cmake_policy(PUSH)\n" - << "cmake_policy(VERSION 2.8.3...3.23)\n"; + << "cmake_policy(VERSION 2.8.3...3.24)\n"; /* clang-format on */ } diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 6e0d704..4100d1f 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -4470,12 +4470,12 @@ bool cmMakefile::SetPolicy(cmPolicies::PolicyID id, } // Deprecate old policies. - if (status == cmPolicies::OLD && id <= cmPolicies::CMP0102 && + if (status == cmPolicies::OLD && id <= cmPolicies::CMP0108 && !(this->GetCMakeInstance()->GetIsInTryCompile() && ( // Policies set by cmCoreTryCompile::TryCompileCode. id == cmPolicies::CMP0065 || id == cmPolicies::CMP0083 || - id == cmPolicies::CMP0091)) && + id == cmPolicies::CMP0091 || id == cmPolicies::CMP0104)) && (!this->IsSet("CMAKE_WARN_DEPRECATED") || this->IsOn("CMAKE_WARN_DEPRECATED"))) { this->IssueMessage(MessageType::DEPRECATION_WARNING, |