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