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/cmake.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/cmake.cxx')
| -rw-r--r-- | Source/cmake.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 278fcc1..6123497 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -1258,15 +1258,13 @@ void cmake::SetArgs(const std::vector<std::string>& args) this->UnprocessedPresetEnvironment = expandedPreset->Environment; if (!expandedPreset->InstallDir.empty() && - this->State->GetInitializedCacheValue("CMAKE_INSTALL_PREFIX") == - nullptr) { + !this->State->GetInitializedCacheValue("CMAKE_INSTALL_PREFIX")) { this->UnprocessedPresetVariables["CMAKE_INSTALL_PREFIX"] = { "PATH", expandedPreset->InstallDir }; } if (!expandedPreset->ToolchainFile.empty() && - this->State->GetInitializedCacheValue("CMAKE_TOOLCHAIN_FILE") == - nullptr) { + !this->State->GetInitializedCacheValue("CMAKE_TOOLCHAIN_FILE")) { this->UnprocessedPresetVariables["CMAKE_TOOLCHAIN_FILE"] = { "FILEPATH", expandedPreset->ToolchainFile }; |