diff options
| author | Brad King <brad.king@kitware.com> | 2021-05-11 13:26:27 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-05-11 13:26:39 (GMT) |
| commit | a94332ed371b3663f7587a945ef2bba5af1e133b (patch) | |
| tree | 91d9256a284b44597ea0984a794f79fed20c3d1f /Source/cmLocalGenerator.cxx | |
| parent | 6c5a2b2171722b09398ca703477251b122448df0 (diff) | |
| parent | ce97b7909bdd4be78c4be2e2326c5ae3e27a21f0 (diff) | |
| download | CMake-a94332ed371b3663f7587a945ef2bba5af1e133b.zip CMake-a94332ed371b3663f7587a945ef2bba5af1e133b.tar.gz CMake-a94332ed371b3663f7587a945ef2bba5af1e133b.tar.bz2 | |
Merge topic 'cmprop-nullptr'
ce97b7909b Source: Remove unnecessary comparisons to nullptr
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6112
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index b83a187..db7357a 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -2438,7 +2438,7 @@ void cmLocalGenerator::AddISPCDependencies(cmGeneratorTarget* target) } cmProp ispcHeaderSuffixProp = target->GetProperty("ISPC_HEADER_SUFFIX"); - assert(ispcHeaderSuffixProp != nullptr); + assert(ispcHeaderSuffixProp); std::vector<std::string> ispcArchSuffixes = detail::ComputeISPCObjectSuffixes(target); @@ -3001,7 +3001,7 @@ void cmLocalGenerator::AppendIPOLinkerFlags(std::string& flags, const std::string name = "CMAKE_" + lang + "_LINK_OPTIONS_IPO"; cmProp rawFlagsList = this->Makefile->GetDefinition(name); - if (rawFlagsList == nullptr) { + if (!rawFlagsList) { return; } @@ -3240,7 +3240,7 @@ void cmLocalGenerator::AppendFeatureOptions(std::string& flags, { cmProp optionList = this->Makefile->GetDefinition( cmStrCat("CMAKE_", lang, "_COMPILE_OPTIONS_", feature)); - if (optionList != nullptr) { + if (optionList) { std::vector<std::string> options = cmExpandedList(*optionList); for (std::string const& o : options) { this->AppendFlagEscape(flags, o); |