echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove compatibility with CMake versions older than 3.1

Browse Source 
This compatibility has been deprecated since commit 3a4791548d
(Deprecate compatibility with CMake versions older than 3.5, 2023-02-09,
v3.27.0-rc1~508^2).  The behavior itself has been deprecated
since CMake 3.1.

Issue: #26613
This commit is contained in:
Brad King 2024-12-09 19:39:34 -05:00
parent 90d814f024
commit dc24d88062
8 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Help/command/DEPRECATED_POLICY_VERSIONS.txt
View File

@ -1,9 +1,9 @@
.. versionchanged:: 4.0 .. versionchanged:: 4.0
Compatibility with versions of CMake older than 3.0 is removed. Compatibility with versions of CMake older than 3.1 is removed.
Calls to :command:`cmake_minimum_required(VERSION)` or Calls to :command:`cmake_minimum_required(VERSION)` or
:command:`cmake_policy(VERSION)` that do not specify at least :command:`cmake_policy(VERSION)` that do not specify at least
3.0 as their policy version (optionally via ``...<max>``) 3.1 as their policy version (optionally via ``...<max>``)
will produce an error in CMake 4.0 and above. will produce an error in CMake 4.0 and above.
.. versionchanged:: 3.31 .. versionchanged:: 3.31

2
Help/release/dev/remove-old-compatibility.rst
View File

@ -1,7 +1,7 @@
remove-old-compatibility remove-old-compatibility
------------------------ ------------------------
* Compatibility with versions of CMake older than 3.0 has been removed. * Compatibility with versions of CMake older than 3.1 has been removed.
Calls to :command:`cmake_minimum_required` or :command:`cmake_policy` Calls to :command:`cmake_minimum_required` or :command:`cmake_policy`
that set the policy version to an older value now issue an error. that set the policy version to an older value now issue an error.
Note that calls to those commands can still support older versions of Note that calls to those commands can still support older versions of

2
Source/cmMakefile.cxx
View File

@ -1600,7 +1600,7 @@ void cmMakefile::Configure()
this->SetCheckCMP0000(true); this->SetCheckCMP0000(true);
// Implicitly set the version for the user. // Implicitly set the version for the user.
cmPolicies::ApplyPolicyVersion(this, 3, 0, 0, cmPolicies::ApplyPolicyVersion(this, 3, 1, 0,
cmPolicies::WarnCompat::Off); cmPolicies::WarnCompat::Off);
} }
} }

6
Source/cmPolicies.cxx
View File

@ -295,16 +295,16 @@ bool cmPolicies::ApplyPolicyVersion(cmMakefile* mf, unsigned int majorVer,
WarnCompat warnCompat) WarnCompat warnCompat)
{ {
// Error on policy versions for which support has been removed. // Error on policy versions for which support has been removed.
if (majorVer < 3) { if (majorVer < 3 || (majorVer == 3 && minorVer < 1)) {
if (IsFromLegacyInstallEXPORT(mf, majorVer, minorVer, patchVer)) { if (IsFromLegacyInstallEXPORT(mf, majorVer, minorVer, patchVer)) {
// Silently tolerate cmake_policy calls generated by install(EXPORT) // Silently tolerate cmake_policy calls generated by install(EXPORT)
// in CMake versions prior to 3.18. // in CMake versions prior to 3.18.
majorVer = 3; majorVer = 3;
minorVer = 0; minorVer = 1;
patchVer = 0; patchVer = 0;
} else { } else {
mf->IssueMessage(MessageType::FATAL_ERROR, mf->IssueMessage(MessageType::FATAL_ERROR,
"Compatibility with CMake < 3.0 has been removed " "Compatibility with CMake < 3.1 has been removed "
"from CMake.\n" ADVICE_UPDATE_VERSION_ARGUMENT); "from CMake.\n" ADVICE_UPDATE_VERSION_ARGUMENT);
cmSystemTools::SetFatalErrorOccurred(); cmSystemTools::SetFatalErrorOccurred();
return false; return false;

2
Tests/RunCMake/cmake_minimum_required/BeforeVersionRemoved-stderr.txt
View File

@ -1,5 +1,5 @@
^CMake Error at BeforeVersionRemoved\.cmake:1 \(cmake_minimum_required\): ^CMake Error at BeforeVersionRemoved\.cmake:1 \(cmake_minimum_required\):
Compatibility with CMake < 3\.0 has been removed from CMake\. Compatibility with CMake < 3\.1 has been removed from CMake\.
Update the VERSION argument <min> value\. Or, use the <min>\.\.\.<max> syntax Update the VERSION argument <min> value\. Or, use the <min>\.\.\.<max> syntax
to tell CMake that the project requires at least <min> but has been updated to tell CMake that the project requires at least <min> but has been updated

2
Tests/RunCMake/cmake_minimum_required/BeforeVersionRemoved.cmake
View File

@ -1 +1 @@
cmake_minimum_required(VERSION 2.8.12) cmake_minimum_required(VERSION 3.0)

2
Tests/RunCMake/cmake_minimum_required/PolicyBeforeVersionRemoved-stderr.txt
View File

@ -1,5 +1,5 @@
^CMake Error at PolicyBeforeVersionRemoved\.cmake:1 \(cmake_policy\): ^CMake Error at PolicyBeforeVersionRemoved\.cmake:1 \(cmake_policy\):
Compatibility with CMake < 3\.0 has been removed from CMake\. Compatibility with CMake < 3\.1 has been removed from CMake\.
Update the VERSION argument <min> value\. Or, use the <min>\.\.\.<max> syntax Update the VERSION argument <min> value\. Or, use the <min>\.\.\.<max> syntax
to tell CMake that the project requires at least <min> but has been updated to tell CMake that the project requires at least <min> but has been updated

2
Tests/RunCMake/cmake_minimum_required/PolicyBeforeVersionRemoved.cmake
View File

@ -1 +1 @@
cmake_policy(VERSION 2.8.12) cmake_policy(VERSION 3.0)