From 5cd26691466ce873ca1dddbb8ab1d039bb2cfce8 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 5 Feb 2025 13:48:07 -0500 Subject: Add deprecation warnings for policies CMP0142 and below The OLD behaviors of all policies are deprecated, but only by documentation. Add an explicit deprecation diagnostic for policies introduced in CMake 3.25 and below to encourage projects to port away from setting policies to OLD. --- Source/cmMakefile.cxx | 4 ++-- .../RunCMake/MSVCDebugInformationFormat/CMP0141-OLD-stderr.txt | 10 ++++++++++ .../PrecompileHeaders/PchReuseFrom-CMP0141-OLD-stderr.txt | 10 ++++++++++ Tests/RunCMake/XcodeProject/SearchPaths-stderr.txt | 10 ++++++++++ Tests/RunCMake/return/CMP0140-OLD-stderr.txt | 10 ++++++++++ 5 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 Tests/RunCMake/MSVCDebugInformationFormat/CMP0141-OLD-stderr.txt create mode 100644 Tests/RunCMake/PrecompileHeaders/PchReuseFrom-CMP0141-OLD-stderr.txt create mode 100644 Tests/RunCMake/XcodeProject/SearchPaths-stderr.txt create mode 100644 Tests/RunCMake/return/CMP0140-OLD-stderr.txt diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index d98c59b..dd1d7cd 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -4034,14 +4034,14 @@ bool cmMakefile::SetPolicy(cmPolicies::PolicyID id, } // Deprecate old policies. - if (status == cmPolicies::OLD && id <= cmPolicies::CMP0139 && + if (status == cmPolicies::OLD && id <= cmPolicies::CMP0142 && !(this->GetCMakeInstance()->GetIsInTryCompile() && ( // Policies set by cmCoreTryCompile::TryCompileCode. id == cmPolicies::CMP0083 || id == cmPolicies::CMP0091 || id == cmPolicies::CMP0104 || id == cmPolicies::CMP0123 || id == cmPolicies::CMP0126 || id == cmPolicies::CMP0128 || - id == cmPolicies::CMP0136)) && + id == cmPolicies::CMP0136 || id == cmPolicies::CMP0141)) && (!this->IsSet("CMAKE_WARN_DEPRECATED") || this->IsOn("CMAKE_WARN_DEPRECATED"))) { this->IssueMessage(MessageType::DEPRECATION_WARNING, diff --git a/Tests/RunCMake/MSVCDebugInformationFormat/CMP0141-OLD-stderr.txt b/Tests/RunCMake/MSVCDebugInformationFormat/CMP0141-OLD-stderr.txt new file mode 100644 index 0000000..92ec2d4 --- /dev/null +++ b/Tests/RunCMake/MSVCDebugInformationFormat/CMP0141-OLD-stderr.txt @@ -0,0 +1,10 @@ +^CMake Deprecation Warning at CMP0141-OLD\.cmake:[0-9]+ \(cmake_policy\): + The OLD behavior for policy CMP0141 will be removed from a future version + of CMake\. + + The cmake-policies\(7\) manual explains that the OLD behaviors of all + policies are deprecated and that a policy should be set to OLD only under + specific short-term circumstances\. Projects should be ported to the NEW + behavior and not rely on setting a policy to OLD\. +Call Stack \(most recent call first\): + CMakeLists\.txt:[0-9]+ \(include\)$ diff --git a/Tests/RunCMake/PrecompileHeaders/PchReuseFrom-CMP0141-OLD-stderr.txt b/Tests/RunCMake/PrecompileHeaders/PchReuseFrom-CMP0141-OLD-stderr.txt new file mode 100644 index 0000000..ae26054 --- /dev/null +++ b/Tests/RunCMake/PrecompileHeaders/PchReuseFrom-CMP0141-OLD-stderr.txt @@ -0,0 +1,10 @@ +^CMake Deprecation Warning at PchReuseFrom-CMP0141-OLD\.cmake:[0-9]+ \(cmake_policy\): + The OLD behavior for policy CMP0141 will be removed from a future version + of CMake\. + + The cmake-policies\(7\) manual explains that the OLD behaviors of all + policies are deprecated and that a policy should be set to OLD only under + specific short-term circumstances\. Projects should be ported to the NEW + behavior and not rely on setting a policy to OLD\. +Call Stack \(most recent call first\): + CMakeLists\.txt:[0-9]+ \(include\)$ diff --git a/Tests/RunCMake/XcodeProject/SearchPaths-stderr.txt b/Tests/RunCMake/XcodeProject/SearchPaths-stderr.txt new file mode 100644 index 0000000..74abd7d --- /dev/null +++ b/Tests/RunCMake/XcodeProject/SearchPaths-stderr.txt @@ -0,0 +1,10 @@ +^CMake Deprecation Warning at SearchPaths\.cmake:[0-9]+ \(cmake_policy\): + The OLD behavior for policy CMP0142 will be removed from a future version + of CMake\. + + The cmake-policies\(7\) manual explains that the OLD behaviors of all + policies are deprecated and that a policy should be set to OLD only under + specific short-term circumstances\. Projects should be ported to the NEW + behavior and not rely on setting a policy to OLD\. +Call Stack \(most recent call first\): + CMakeLists\.txt:[0-9]+ \(include\)$ diff --git a/Tests/RunCMake/return/CMP0140-OLD-stderr.txt b/Tests/RunCMake/return/CMP0140-OLD-stderr.txt new file mode 100644 index 0000000..bcd37c2 --- /dev/null +++ b/Tests/RunCMake/return/CMP0140-OLD-stderr.txt @@ -0,0 +1,10 @@ +^CMake Deprecation Warning at CMP0140-OLD\.cmake:[0-9]+ \(cmake_policy\): + The OLD behavior for policy CMP0140 will be removed from a future version + of CMake\. + + The cmake-policies\(7\) manual explains that the OLD behaviors of all + policies are deprecated and that a policy should be set to OLD only under + specific short-term circumstances\. Projects should be ported to the NEW + behavior and not rely on setting a policy to OLD\. +Call Stack \(most recent call first\): + CMakeLists\.txt:[0-9]+ \(include\)$ -- cgit v0.12