diff options
| author | Brad King <brad.king@kitware.com> | 2015-06-09 13:19:00 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-06-09 13:19:00 (GMT) |
| commit | d78fbb6ad460dee47f53a0680368c2f536087800 (patch) | |
| tree | 01acb4b9a05c4956e0a3b612986c1003eb47dca3 /Source/cmGetPropertyCommand.cxx | |
| parent | 1adcec3983c4c017f4e0d79e5bb7d68742ec58ea (diff) | |
| parent | 52b9d828ab482f5eaae3313d821d9a4a492f069b (diff) | |
| download | CMake-d78fbb6ad460dee47f53a0680368c2f536087800.zip CMake-d78fbb6ad460dee47f53a0680368c2f536087800.tar.gz CMake-d78fbb6ad460dee47f53a0680368c2f536087800.tar.bz2 | |
Merge topic 'move-CMP0059-handling'
52b9d828 cmMakefile: Move CMP0059 handling to command code.
fe603c7d cmGetDirectoryPropertyCommand: Move variable to the point of use.
8fc53c3c cmGetDirectoryPropertyCommand: Extract StoreResult method.
Diffstat (limited to 'Source/cmGetPropertyCommand.cxx')
| -rw-r--r-- | Source/cmGetPropertyCommand.cxx | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/Source/cmGetPropertyCommand.cxx b/Source/cmGetPropertyCommand.cxx index 36b6c64..33d638b 100644 --- a/Source/cmGetPropertyCommand.cxx +++ b/Source/cmGetPropertyCommand.cxx @@ -279,6 +279,22 @@ bool cmGetPropertyCommand::HandleDirectoryMode() } } + if (this->PropertyName == "DEFINITIONS") + { + switch(mf->GetPolicyStatus(cmPolicies::CMP0059)) + { + case cmPolicies::WARN: + mf->IssueMessage(cmake::AUTHOR_WARNING, + cmPolicies::GetPolicyWarning(cmPolicies::CMP0059)); + case cmPolicies::OLD: + return this->StoreResult(mf->GetDefineFlagsCMP0059()); + case cmPolicies::NEW: + case cmPolicies::REQUIRED_ALWAYS: + case cmPolicies::REQUIRED_IF_USED: + break; + } + } + // Get the property. return this->StoreResult(mf->GetProperty(this->PropertyName)); } |