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

Merge topic 'fix-CMP0009-future-states' 

a3a8177e cmFileCommand: Fix implementation of CMP0009.
This commit is contained in:
Brad King 2015-06-11 13:16:19 -04:00 committed by CMake Topic Stage
parent 71d5245990 a3a8177edd
commit d569008868
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/cmFileCommand.cxx
View File

@ -906,13 +906,13 @@ bool cmFileCommand::HandleGlobCommand(std::vector<std::string> const& args,
{ {
switch(status) switch(status)
{ {
case cmPolicies::REQUIRED_IF_USED:
case cmPolicies::REQUIRED_ALWAYS:
case cmPolicies::NEW: case cmPolicies::NEW:
g.RecurseThroughSymlinksOff(); g.RecurseThroughSymlinksOff();
break; break;
case cmPolicies::OLD: case cmPolicies::OLD:
case cmPolicies::WARN: case cmPolicies::WARN:
case cmPolicies::REQUIRED_IF_USED:
case cmPolicies::REQUIRED_ALWAYS:
g.RecurseThroughSymlinksOn(); g.RecurseThroughSymlinksOn();
break; break;
} }
@ -1044,6 +1044,8 @@ bool cmFileCommand::HandleGlobCommand(std::vector<std::string> const& args,
{ {
switch (status) switch (status)
{ {
case cmPolicies::REQUIRED_IF_USED:
case cmPolicies::REQUIRED_ALWAYS:
case cmPolicies::NEW: case cmPolicies::NEW:
// Correct behavior, yay! // Correct behavior, yay!
break; break;
@ -1059,12 +1061,6 @@ bool cmFileCommand::HandleGlobCommand(std::vector<std::string> const& args,
cmPolicies::GetPolicyWarning(cmPolicies::CMP0009)); cmPolicies::GetPolicyWarning(cmPolicies::CMP0009));
} }
break; break;
case cmPolicies::REQUIRED_IF_USED:
case cmPolicies::REQUIRED_ALWAYS:
this->SetError("policy CMP0009 error");
this->Makefile->IssueMessage(cmake::FATAL_ERROR,
cmPolicies::GetRequiredPolicyError(cmPolicies::CMP0009));
return false;
} }
} }