diff options
Diffstat (limited to 'Source/cmInstallDirectoryGenerator.cxx')
| -rw-r--r-- | Source/cmInstallDirectoryGenerator.cxx | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/Source/cmInstallDirectoryGenerator.cxx b/Source/cmInstallDirectoryGenerator.cxx index 54ad85c..e4209bd 100644 --- a/Source/cmInstallDirectoryGenerator.cxx +++ b/Source/cmInstallDirectoryGenerator.cxx @@ -7,7 +7,8 @@ #include "cmLocalGenerator.h" #include "cmMakefile.h" #include "cmSystemTools.h" -#include "cm_auto_ptr.hxx" + +#include <memory> // IWYU pragma: keep cmInstallDirectoryGenerator::cmInstallDirectoryGenerator( std::vector<std::string> const& dirs, const char* dest, @@ -17,7 +18,7 @@ cmInstallDirectoryGenerator::cmInstallDirectoryGenerator( bool optional) : cmInstallGenerator(dest, configurations, component, message, exclude_from_all) - , LocalGenerator(CM_NULLPTR) + , LocalGenerator(nullptr) , Directories(dirs) , FilePermissions(file_permissions) , DirPermissions(dir_permissions) @@ -62,19 +63,17 @@ void cmInstallDirectoryGenerator::GenerateScriptForConfig( { std::vector<std::string> dirs; cmGeneratorExpression ge; - for (std::vector<std::string>::const_iterator i = this->Directories.begin(); - i != this->Directories.end(); ++i) { - CM_AUTO_PTR<cmCompiledGeneratorExpression> cge = ge.Parse(*i); + for (std::string const& d : this->Directories) { + std::unique_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(d); cmSystemTools::ExpandListArgument( cge->Evaluate(this->LocalGenerator, config), dirs); } // Make sure all dirs have absolute paths. cmMakefile const& mf = *this->LocalGenerator->GetMakefile(); - for (std::vector<std::string>::iterator i = dirs.begin(); i != dirs.end(); - ++i) { - if (!cmSystemTools::FileIsFullPath(i->c_str())) { - *i = std::string(mf.GetCurrentSourceDirectory()) + "/" + *i; + for (std::string& d : dirs) { + if (!cmSystemTools::FileIsFullPath(d.c_str())) { + d = std::string(mf.GetCurrentSourceDirectory()) + "/" + d; } } @@ -86,7 +85,7 @@ void cmInstallDirectoryGenerator::AddDirectoryInstallRule( std::vector<std::string> const& dirs) { // Write code to install the directories. - const char* no_rename = CM_NULLPTR; + const char* no_rename = nullptr; this->AddInstallRule(os, this->GetDestination(config), cmInstallType_DIRECTORY, dirs, this->Optional, this->FilePermissions.c_str(), |