diff options
| author | Sebastian Holtermann <sebholt@xwmw.org> | 2019-05-23 14:49:54 +0200 |
|---|---|---|
| committer | Sebastian Holtermann <sebholt@xwmw.org> | 2019-05-23 16:19:49 +0200 |
| commit | 006229278b54ee92003100773a0430565fb8fe87 (patch) | |
| tree | 04a9927d32bf98df5685fde3b0e5be4811e67f8d /Source/cmExtraCodeBlocksGenerator.cxx | |
| parent | 999516478d56d8604d1413fe3c677a860357516c (diff) | |
| download | cmake-006229278b54ee92003100773a0430565fb8fe87.tar.gz | |
Use cmAppend to append ranges to std::vector instances
Diffstat (limited to 'Source/cmExtraCodeBlocksGenerator.cxx')
| -rw-r--r-- | Source/cmExtraCodeBlocksGenerator.cxx | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx index c6e44e3d65..f47744b605 100644 --- a/Source/cmExtraCodeBlocksGenerator.cxx +++ b/Source/cmExtraCodeBlocksGenerator.cxx @@ -209,9 +209,7 @@ void cmExtraCodeBlocksGenerator::CreateNewProjectFile( // Collect all files std::vector<std::string> listFiles; for (cmLocalGenerator* lg : it.second) { - const std::vector<std::string>& files = - lg->GetMakefile()->GetListFiles(); - listFiles.insert(listFiles.end(), files.begin(), files.end()); + cmAppend(listFiles, lg->GetMakefile()->GetListFiles()); } // Convert @@ -563,27 +561,24 @@ void cmExtraCodeBlocksGenerator::AppendTarget( // the include directories for this target std::vector<std::string> allIncludeDirs; - - std::vector<std::string> includes; - lg->GetIncludeDirectories(includes, target, "C", buildType); - - allIncludeDirs.insert(allIncludeDirs.end(), includes.begin(), - includes.end()); + { + std::vector<std::string> includes; + lg->GetIncludeDirectories(includes, target, "C", buildType); + cmAppend(allIncludeDirs, includes); + } std::string systemIncludeDirs = makefile->GetSafeDefinition( "CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_INCLUDE_DIRS"); if (!systemIncludeDirs.empty()) { - std::vector<std::string> dirs; - cmSystemTools::ExpandListArgument(systemIncludeDirs, dirs); - allIncludeDirs.insert(allIncludeDirs.end(), dirs.begin(), dirs.end()); + cmAppend(allIncludeDirs, + cmSystemTools::ExpandedListArgument(systemIncludeDirs)); } systemIncludeDirs = makefile->GetSafeDefinition( "CMAKE_EXTRA_GENERATOR_C_SYSTEM_INCLUDE_DIRS"); if (!systemIncludeDirs.empty()) { - std::vector<std::string> dirs; - cmSystemTools::ExpandListArgument(systemIncludeDirs, dirs); - allIncludeDirs.insert(allIncludeDirs.end(), dirs.begin(), dirs.end()); + cmAppend(allIncludeDirs, + cmSystemTools::ExpandedListArgument(systemIncludeDirs)); } std::vector<std::string>::const_iterator end = |