diff options
| author | Brad King <brad.king@kitware.com> | 2020-07-15 10:47:39 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-07-15 10:47:46 (GMT) |
| commit | 2d294219a5e8388b68bf2bec77946ce3477ba2c7 (patch) | |
| tree | 6a69b5fb825a1dfecdcf0e37e0e2163cb93fcc61 /Source/cmGeneratorTarget.cxx | |
| parent | 4b406ecbf95ca19c0d6fbfca44ebca2e2ef95d6c (diff) | |
| parent | 715691124240b696c8be1d7cd6ce6dbb09381c67 (diff) | |
| download | CMake-2d294219a5e8388b68bf2bec77946ce3477ba2c7.zip CMake-2d294219a5e8388b68bf2bec77946ce3477ba2c7.tar.gz CMake-2d294219a5e8388b68bf2bec77946ce3477ba2c7.tar.bz2 | |
Merge topic 'ison-stdstring'
7156911242 cmIsOn: add overload accepting const std::string*
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5013
Diffstat (limited to 'Source/cmGeneratorTarget.cxx')
| -rw-r--r-- | Source/cmGeneratorTarget.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index 9e6f995..46615d3 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -854,9 +854,8 @@ bool cmGeneratorTarget::IsIPOEnabled(std::string const& lang, std::string const& config) const { cmProp feature = this->GetFeature("INTERPROCEDURAL_OPTIMIZATION", config); - const bool result = feature && cmIsOn(*feature); - if (!result) { + if (!cmIsOn(feature)) { // 'INTERPROCEDURAL_OPTIMIZATION' is off, no need to check policies return false; } @@ -1001,7 +1000,7 @@ bool cmGeneratorTarget::GetLanguageStandardRequired( { cmProp p = this->GetPropertyWithPairedLanguageSupport(lang, "_STANDARD_REQUIRED"); - return p && cmIsOn(*p); + return cmIsOn(p); } void cmGeneratorTarget::GetModuleDefinitionSources( |