diff options
Diffstat (limited to 'Source/cmCPackPropertiesGenerator.cxx')
| -rw-r--r-- | Source/cmCPackPropertiesGenerator.cxx | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/Source/cmCPackPropertiesGenerator.cxx b/Source/cmCPackPropertiesGenerator.cxx index 57a8b383c1..a33b824f34 100644 --- a/Source/cmCPackPropertiesGenerator.cxx +++ b/Source/cmCPackPropertiesGenerator.cxx @@ -6,7 +6,6 @@ #include <map> #include <ostream> -#include <utility> cmCPackPropertiesGenerator::cmCPackPropertiesGenerator( cmLocalGenerator* lg, cmInstalledFile const& installedFile, @@ -27,19 +26,17 @@ void cmCPackPropertiesGenerator::GenerateScriptForConfig( cmInstalledFile::PropertyMapType const& properties = this->InstalledFile.GetProperties(); - for (cmInstalledFile::PropertyMapType::const_iterator i = properties.begin(); - i != properties.end(); ++i) { - std::string const& name = i->first; - cmInstalledFile::Property const& property = i->second; + for (cmInstalledFile::PropertyMapType::value_type const& i : properties) { + std::string const& name = i.first; + cmInstalledFile::Property const& property = i.second; os << indent << "set_property(INSTALL " << cmOutputConverter::EscapeForCMake(expandedFileName) << " PROPERTY " << cmOutputConverter::EscapeForCMake(name); - for (cmInstalledFile::ExpressionVectorType::const_iterator j = - property.ValueExpressions.begin(); - j != property.ValueExpressions.end(); ++j) { - std::string value = (*j)->Evaluate(this->LG, config); + for (cmInstalledFile::ExpressionVectorType::value_type const& j : + property.ValueExpressions) { + std::string value = j->Evaluate(this->LG, config); os << " " << cmOutputConverter::EscapeForCMake(value); } |