diff options
| author | Kyle Edwards <kyle.edwards@kitware.com> | 2020-07-15 14:53:35 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-07-15 14:53:43 (GMT) |
| commit | 63ecf481da4d88196410ca67ebd0c9aa69f2e036 (patch) | |
| tree | 67d0887bbd39819d995280b3e8ff575066bc4929 /Source/cmFindPackageCommand.cxx | |
| parent | 36e00f9c843d2e03661119182fd98f0668320e09 (diff) | |
| parent | eaad8072eefb9cbb7bf60d9753492e6fb604fd09 (diff) | |
| download | CMake-63ecf481da4d88196410ca67ebd0c9aa69f2e036.zip CMake-63ecf481da4d88196410ca67ebd0c9aa69f2e036.tar.gz CMake-63ecf481da4d88196410ca67ebd0c9aa69f2e036.tar.bz2 | |
Merge topic 'cmnonempty'
eaad8072ee cmNonempty: Convenience inlines to check for non-empty string
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5017
Diffstat (limited to 'Source/cmFindPackageCommand.cxx')
| -rw-r--r-- | Source/cmFindPackageCommand.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx index e5fa14e..ae06047 100644 --- a/Source/cmFindPackageCommand.cxx +++ b/Source/cmFindPackageCommand.cxx @@ -1121,7 +1121,7 @@ void cmFindPackageCommand::AppendToFoundProperty(bool found) std::vector<std::string> foundContents; cmProp foundProp = this->Makefile->GetState()->GetGlobalProperty("PACKAGES_FOUND"); - if (foundProp && !foundProp->empty()) { + if (cmNonempty(foundProp)) { cmExpandList(*foundProp, foundContents, false); auto nameIt = std::find(foundContents.begin(), foundContents.end(), this->Name); @@ -1133,7 +1133,7 @@ void cmFindPackageCommand::AppendToFoundProperty(bool found) std::vector<std::string> notFoundContents; cmProp notFoundProp = this->Makefile->GetState()->GetGlobalProperty("PACKAGES_NOT_FOUND"); - if (notFoundProp && !notFoundProp->empty()) { + if (cmNonempty(notFoundProp)) { cmExpandList(*notFoundProp, notFoundContents, false); auto nameIt = std::find(notFoundContents.begin(), notFoundContents.end(), this->Name); |