diff options
| author | Brad King <brad.king@kitware.com> | 2020-03-27 11:49:29 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-03-27 11:50:28 (GMT) |
| commit | a6611577c33538af959348b49aec817dd9649c03 (patch) | |
| tree | 788be17486c62f52ca6966fb6640a60592242aa3 /Source/cmMakefileTargetGenerator.cxx | |
| parent | 7e3d81b1df9e2c192585d83300344546439e50bd (diff) | |
| parent | c84cf42897e4d95706d4f750c2ad085c84a259f2 (diff) | |
| download | CMake-a6611577c33538af959348b49aec817dd9649c03.zip CMake-a6611577c33538af959348b49aec817dd9649c03.tar.gz CMake-a6611577c33538af959348b49aec817dd9649c03.tar.bz2 | |
Merge topic 'cmprop-getglobalprop'
c84cf42897 cmState::GetGlobalProperty: return cmProp
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4521
Diffstat (limited to 'Source/cmMakefileTargetGenerator.cxx')
| -rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index f0fc34f..91daeda 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -46,9 +46,8 @@ cmMakefileTargetGenerator::cmMakefileTargetGenerator(cmGeneratorTarget* target) this->LocalGenerator->GetGlobalGenerator()); cmake* cm = this->GlobalGenerator->GetCMakeInstance(); this->NoRuleMessages = false; - if (const char* ruleStatus = - cm->GetState()->GetGlobalProperty("RULE_MESSAGES")) { - this->NoRuleMessages = cmIsOff(ruleStatus); + if (cmProp ruleStatus = cm->GetState()->GetGlobalProperty("RULE_MESSAGES")) { + this->NoRuleMessages = cmIsOff(*ruleStatus); } MacOSXContentGenerator = cm::make_unique<MacOSXContentGeneratorType>(this); } |