diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-06-09 21:55:56 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-06-09 22:06:29 (GMT) |
| commit | a3a8177eddfdfc89fae9331ca794abbc67f5d543 (patch) | |
| tree | 736bf89e9d2900ebc3cbcc571a30e9cb71143b20 /Source/cmFileCommand.cxx | |
| parent | 1c65ce52454db3cd7d9aff47e30456a50825de44 (diff) | |
| download | CMake-a3a8177eddfdfc89fae9331ca794abbc67f5d543.zip CMake-a3a8177eddfdfc89fae9331ca794abbc67f5d543.tar.gz CMake-a3a8177eddfdfc89fae9331ca794abbc67f5d543.tar.bz2 | |
cmFileCommand: Fix implementation of CMP0009.
Diffstat (limited to 'Source/cmFileCommand.cxx')
| -rw-r--r-- | Source/cmFileCommand.cxx | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index 4698468..7440357 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -906,13 +906,13 @@ bool cmFileCommand::HandleGlobCommand(std::vector<std::string> const& args, { switch(status) { + case cmPolicies::REQUIRED_IF_USED: + case cmPolicies::REQUIRED_ALWAYS: case cmPolicies::NEW: g.RecurseThroughSymlinksOff(); break; case cmPolicies::OLD: case cmPolicies::WARN: - case cmPolicies::REQUIRED_IF_USED: - case cmPolicies::REQUIRED_ALWAYS: g.RecurseThroughSymlinksOn(); break; } @@ -1044,6 +1044,8 @@ bool cmFileCommand::HandleGlobCommand(std::vector<std::string> const& args, { switch (status) { + case cmPolicies::REQUIRED_IF_USED: + case cmPolicies::REQUIRED_ALWAYS: case cmPolicies::NEW: // Correct behavior, yay! break; @@ -1059,12 +1061,6 @@ bool cmFileCommand::HandleGlobCommand(std::vector<std::string> const& args, cmPolicies::GetPolicyWarning(cmPolicies::CMP0009)); } 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; } } |