Commit cd4d2acb authored by Ken Martin's avatar Ken Martin
Browse files

ENH: more policy changes

parent 96ee85d1
...@@ -121,6 +121,9 @@ bool cmCMakeMinimumRequired ...@@ -121,6 +121,9 @@ bool cmCMakeMinimumRequired
} }
} }
// set the policy version as well
this->Makefile->SetPolicyVersion(version_string.c_str());
return true; return true;
} }
...@@ -184,7 +184,21 @@ bool cmPolicies::ApplyPolicyVersion(cmMakefile *mf, ...@@ -184,7 +184,21 @@ bool cmPolicies::ApplyPolicyVersion(cmMakefile *mf,
{ {
patchVer = atoi(patch.c_str()); patchVer = atoi(patch.c_str());
} }
// add in the old CMAKE_BACKWARDS_COMPATIBILITY var for old CMake compatibility
if ((majorVer == 2 && minorVer <= 4) || majorVer < 2)
{
if (!mf->GetCacheManager()->GetCacheValue("CMAKE_BACKWARDS_COMPATIBILITY"))
{
mf->AddCacheDefinition
("CMAKE_BACKWARDS_COMPATIBILITY",version,
"For backwards compatibility, what version of CMake commands and "
"syntax should this version of CMake try to support.",
cmCacheManager::STRING);
}
}
// now loop over all the policies and set them as appropriate // now loop over all the policies and set them as appropriate
std::map<cmPolicies::PolicyID,cmPolicy *>::iterator i std::map<cmPolicies::PolicyID,cmPolicy *>::iterator i
= this->Policies.begin(); = this->Policies.begin();
......
...@@ -1899,19 +1899,6 @@ int cmake::ActualConfigure() ...@@ -1899,19 +1899,6 @@ int cmake::ActualConfigure()
cmCacheManager::INTERNAL); cmCacheManager::INTERNAL);
} }
// set the default BACKWARDS compatibility to the current version
if(!this->CacheManager->GetCacheValue("CMAKE_BACKWARDS_COMPATIBILITY"))
{
char ver[256];
sprintf(ver,"%i.%i",cmVersion::GetMajorVersion(),
cmVersion::GetMinorVersion());
this->CacheManager->AddCacheEntry
("CMAKE_BACKWARDS_COMPATIBILITY",ver,
"For backwards compatibility, what version of CMake commands and "
"syntax should this version of CMake allow.",
cmCacheManager::STRING);
}
// no generator specified on the command line // no generator specified on the command line
if(!this->GlobalGenerator) if(!this->GlobalGenerator)
{ {
...@@ -2393,19 +2380,6 @@ int cmake::LoadCache() ...@@ -2393,19 +2380,6 @@ int cmake::LoadCache()
return -3; return -3;
} }
// set the default BACKWARDS compatibility to the current version
if(!this->CacheManager->GetCacheValue("CMAKE_BACKWARDS_COMPATIBILITY"))
{
char ver[256];
sprintf(ver,"%i.%i",cmVersion::GetMajorVersion(),
cmVersion::GetMinorVersion());
this->CacheManager->AddCacheEntry
("CMAKE_BACKWARDS_COMPATIBILITY",ver,
"For backwards compatibility, what version of CMake commands and "
"syntax should this version of CMake allow.",
cmCacheManager::STRING);
}
return 0; return 0;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment