kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmMakefile: Simplify computation of ancient policy status.

This commit is contained in:
Stephen Kelly 2015-07-06 02:04:12 +02:00
parent 658bfc5c52
commit d0dcce15f4
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Source/cmMakefile.cxx
View File

@ -4743,6 +4743,13 @@ cmPolicies::PolicyStatus
cmMakefile::GetPolicyStatus(cmPolicies::PolicyID id) const cmMakefile::GetPolicyStatus(cmPolicies::PolicyID id) const
{ {
cmPolicies::PolicyStatus status = cmPolicies::GetPolicyStatus(id); cmPolicies::PolicyStatus status = cmPolicies::GetPolicyStatus(id);
if(status == cmPolicies::REQUIRED_ALWAYS ||
status == cmPolicies::REQUIRED_IF_USED)
{
return status;
}
cmLocalGenerator* lg = this->LocalGenerator; cmLocalGenerator* lg = this->LocalGenerator;
while(lg) while(lg)
{ {
@ -4758,20 +4765,6 @@ cmMakefile::GetPolicyStatus(cmPolicies::PolicyID id) const
} }
lg = lg->GetParent(); lg = lg->GetParent();
} }
// If the policy is required to be set to NEW but is not, ignore the
// current setting and tell the caller.
if(status != cmPolicies::NEW)
{
cmPolicies::PolicyStatus def = cmPolicies::GetPolicyStatus(id);
if(def == cmPolicies::REQUIRED_ALWAYS ||
def == cmPolicies::REQUIRED_IF_USED)
{
return def;
}
}
// The current setting is okay.
return status; return status;
} }