diff options
Diffstat (limited to 'Source/cmInstalledFile.cxx')
-rw-r--r-- | Source/cmInstalledFile.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/Source/cmInstalledFile.cxx b/Source/cmInstalledFile.cxx index 537b4ecec..eabe5903b 100644 --- a/Source/cmInstalledFile.cxx +++ b/Source/cmInstalledFile.cxx @@ -2,12 +2,13 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmInstalledFile.h" +#include <utility> + #include "cmAlgorithms.h" +#include "cmGeneratorExpression.h" #include "cmListFileCache.h" #include "cmMakefile.h" -#include "cmSystemTools.h" - -#include <utility> +#include "cmStringAlgorithms.h" cmInstalledFile::cmInstalledFile() = default; @@ -73,7 +74,7 @@ bool cmInstalledFile::HasProperty(const std::string& prop) const bool cmInstalledFile::GetProperty(const std::string& prop, std::string& value) const { - PropertyMapType::const_iterator i = this->Properties.find(prop); + auto i = this->Properties.find(prop); if (i == this->Properties.end()) { return false; } @@ -97,7 +98,7 @@ bool cmInstalledFile::GetPropertyAsBool(const std::string& prop) const { std::string value; bool isSet = this->GetProperty(prop, value); - return isSet && cmSystemTools::IsOn(value); + return isSet && cmIsOn(value); } void cmInstalledFile::GetPropertyAsList(const std::string& prop, @@ -107,5 +108,5 @@ void cmInstalledFile::GetPropertyAsList(const std::string& prop, this->GetProperty(prop, value); list.clear(); - cmSystemTools::ExpandListArgument(value, list); + cmExpandList(value, list); } |