diff options
| author | Brad King <brad.king@kitware.com> | 2020-02-18 16:24:09 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-02-18 16:24:15 (GMT) |
| commit | a0318e8fc8f65c4c5ee8ffd3e2d886dbe5a2f795 (patch) | |
| tree | 7144f287d6043cbed8cec80c9e0c92ded071e3a7 | |
| parent | b841fdcb9e91e848e57f81129eaf6a1f9b0c0a2d (diff) | |
| parent | c78ae16d81bd5fdc317d3d395978efcfcd6ec6cd (diff) | |
| download | CMake-a0318e8fc8f65c4c5ee8ffd3e2d886dbe5a2f795.zip CMake-a0318e8fc8f65c4c5ee8ffd3e2d886dbe5a2f795.tar.gz CMake-a0318e8fc8f65c4c5ee8ffd3e2d886dbe5a2f795.tar.bz2 | |
Merge topic 'deprecate-policy-old'
c78ae16d81 Add deprecation warnings for policies CMP0071 and below
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4369
| -rw-r--r-- | Help/release/dev/deprecate-policy-old.rst | 8 | ||||
| -rw-r--r-- | Source/cmMakefile.cxx | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/File_Generate/CMP0070-OLD-stderr.txt | 10 |
3 files changed, 19 insertions, 1 deletions
diff --git a/Help/release/dev/deprecate-policy-old.rst b/Help/release/dev/deprecate-policy-old.rst new file mode 100644 index 0000000..cffd206 --- /dev/null +++ b/Help/release/dev/deprecate-policy-old.rst @@ -0,0 +1,8 @@ +deprecate-policy-old +-------------------- + +* An explicit deprecation diagnostic was added for policy ``CMP0070`` + and policy ``CMP0071`` (``CMP0069`` and below were already deprecated). + The :manual:`cmake-policies(7)` manual explains that the OLD behaviors + of all policies are deprecated and that projects should port to the + NEW behaviors. diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index b2e59bd..ed627f8 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -4492,7 +4492,7 @@ 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::CMP0069 && + if (status == cmPolicies::OLD && id <= cmPolicies::CMP0071 && !(this->GetCMakeInstance()->GetIsInTryCompile() && ( // Policies set by cmCoreTryCompile::TryCompileCode. diff --git a/Tests/RunCMake/File_Generate/CMP0070-OLD-stderr.txt b/Tests/RunCMake/File_Generate/CMP0070-OLD-stderr.txt new file mode 100644 index 0000000..bb578e5 --- /dev/null +++ b/Tests/RunCMake/File_Generate/CMP0070-OLD-stderr.txt @@ -0,0 +1,10 @@ +^CMake Deprecation Warning at CMP0070-OLD.cmake:[0-9]+ \(cmake_policy\): + The OLD behavior for policy CMP0070 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\)$ |