Commit 5588ed47 authored by Ken Martin's avatar Ken Martin
Browse files

BUG: change in handling of cmake_minimum_required

parent 385377cf
......@@ -47,10 +47,21 @@ bool cmConfigureFileCommand
const char* versionValue
= this->Makefile->GetDefinition("CMAKE_BACKWARDS_COMPATIBILITY");
if (versionValue && atof(versionValue) > 2.0)
{
{
this->Immediate = true;
}
}
switch (this->Makefile->GetPolicyStatus(cmPolicies::CMP_0003))
{
case cmPolicies::WARN:
case cmPolicies::OLD:
break;
case cmPolicies::NEW:
case cmPolicies::REQUIRED_IF_USED:
case cmPolicies::REQUIRED_ALWAYS:
this->Immediate = true;
}
this->AtOnly = false;
for(unsigned int i=2;i < args.size();++i)
......
......@@ -134,11 +134,6 @@ bool cmListFile::ParseFile(const char* filename,
hasPolicy = true;
break;
}
if (cmSystemTools::LowerCase(i->Name) == "cmake_minimum_required")
{
hasPolicy = true;
break;
}
}
// if no policy command is found this is an error
if(!hasPolicy)
......@@ -148,7 +143,7 @@ bool cmListFile::ParseFile(const char* filename,
GetCacheValue("CMAKE_BACKWARDS_COMPATIBILITY"))
{
mf->AddCacheDefinition
("CMAKE_BACKWARDS_COMPATIBILITY", "2.6",
("CMAKE_BACKWARDS_COMPATIBILITY", "2.4",
"For backwards compatibility, what version of CMake commands and "
"syntax should this version of CMake try to support.",
cmCacheManager::STRING);
......
......@@ -120,7 +120,7 @@ cmPolicies::cmPolicies()
"In CMake 2.2 and later the default behavior is that it will "
"configure the file right when the command is invoked."
,
2,2,0, cmPolicies::NEW);
2,6,0, cmPolicies::NEW);
// this->PolicyStringMap["CMP_CONFIGURE_FILE_IMMEDIATE"] = CMP_0003;
}
......
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