diff options
| author | Brad King <brad.king@kitware.com> | 2015-06-11 17:16:19 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-06-11 17:16:19 (GMT) |
| commit | d5690088683baee7e62716f6c7e89640bb77b4aa (patch) | |
| tree | 7375c34f748ac1cb393283231cd1f897980fbff5 | |
| parent | 71d52459900e2be0c78091cb2df6506b22c2c211 (diff) | |
| parent | a3a8177eddfdfc89fae9331ca794abbc67f5d543 (diff) | |
| download | CMake-d5690088683baee7e62716f6c7e89640bb77b4aa.zip CMake-d5690088683baee7e62716f6c7e89640bb77b4aa.tar.gz CMake-d5690088683baee7e62716f6c7e89640bb77b4aa.tar.bz2 | |
Merge topic 'fix-CMP0009-future-states'
a3a8177e cmFileCommand: Fix implementation of CMP0009.
| -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; } } |