Merge topic 'cleanup-ExpandListArgument-usage'

e2a489c7 Remove some temporary vectors for ExpandListArgument.
0f99feec cmGeneratorExpression: Remove unused header.
722f1a71 CTest: Expand a string directly into a container.

Source/CTest/cmCTestTestHandler.cxx

@@ -2153,25 +2153,11 @@ bool cmCTestTestHandler::SetTestsProperties(
             }
           if ( key == "ATTACHED_FILES" )
             {
-            std::vector<std::string> lval;
+            cmSystemTools::ExpandListArgument(val, rtit->AttachedFiles);
-            cmSystemTools::ExpandListArgument(val, lval);
-
-            for(std::vector<std::string>::iterator f = lval.begin();
-                f != lval.end(); ++f)
-              {
-              rtit->AttachedFiles.push_back(*f);
-              }
             }
           if ( key == "ATTACHED_FILES_ON_FAIL" )
             {
-            std::vector<std::string> lval;
+            cmSystemTools::ExpandListArgument(val, rtit->AttachOnFail);
-            cmSystemTools::ExpandListArgument(val, lval);
-
-            for(std::vector<std::string>::iterator f = lval.begin();
-                f != lval.end(); ++f)
-              {
-              rtit->AttachOnFail.push_back(*f);
-              }
             }
           if ( key == "RESOURCE_LOCK" )
             {
@@ -2195,14 +2181,7 @@ bool cmCTestTestHandler::SetTestsProperties(
             }
           if ( key == "REQUIRED_FILES" )
             {
-            std::vector<std::string> lval;
+            cmSystemTools::ExpandListArgument(val, rtit->RequiredFiles);
-            cmSystemTools::ExpandListArgument(val, lval);
-
-            for(std::vector<std::string>::iterator f = lval.begin();
-                f != lval.end(); ++f)
-              {
-              rtit->RequiredFiles.push_back(*f);
-              }
             }
           if ( key == "RUN_SERIAL" )
             {
@@ -2239,33 +2218,15 @@ bool cmCTestTestHandler::SetTestsProperties(
             }
           if ( key == "DEPENDS" )
             {
-            std::vector<std::string> lval;
+            cmSystemTools::ExpandListArgument(val, rtit->Depends);
-            cmSystemTools::ExpandListArgument(val, lval);
-            std::vector<std::string>::iterator crit;
-            for ( crit = lval.begin(); crit != lval.end(); ++ crit )
-              {
-              rtit->Depends.push_back(*crit);
-              }
             }
           if ( key == "ENVIRONMENT" )
             {
-            std::vector<std::string> lval;
+            cmSystemTools::ExpandListArgument(val, rtit->Environment);
-            cmSystemTools::ExpandListArgument(val, lval);
-            std::vector<std::string>::iterator crit;
-            for ( crit = lval.begin(); crit != lval.end(); ++ crit )
-              {
-              rtit->Environment.push_back(*crit);
-              }
             }
           if ( key == "LABELS" )
             {
-            std::vector<std::string> lval;
+            cmSystemTools::ExpandListArgument(val, rtit->Labels);
-            cmSystemTools::ExpandListArgument(val, lval);
-            std::vector<std::string>::iterator crit;
-            for ( crit = lval.begin(); crit != lval.end(); ++ crit )
-              {
-              rtit->Labels.push_back(*crit);
-              }
             }
           if ( key == "MEASUREMENT" )
             {

Source/cmCTest.cxx

@@ -2598,16 +2598,14 @@ void cmCTest::PopulateCustomVector(cmMakefile* mf, const std::string& def,
     return;
     }
   cmCTestLog(this, DEBUG, "PopulateCustomVector: " << def << std::endl);
-  std::vector<std::string> slist;
-  cmSystemTools::ExpandListArgument(dval, slist);
-  std::vector<std::string>::iterator it;
 
   vec.clear();
+  cmSystemTools::ExpandListArgument(dval, vec);
 
-  for ( it = slist.begin(); it != slist.end(); ++it )
+  for (std::vector<std::string>::const_iterator it = vec.begin();
+       it != vec.end(); ++it )
     {
     cmCTestLog(this, DEBUG, "  -- " << *it << std::endl);
-    vec.push_back(*it);
     }
 }
 

Source/cmGeneratorExpression.cxx

@@ -15,8 +15,6 @@
 #include "cmTarget.h"
 #include "assert.h"
 
-#include <cmsys/String.h>
-
 #include "cmGeneratorExpressionEvaluator.h"
 #include "cmGeneratorExpressionLexer.h"
 #include "cmGeneratorExpressionParser.h"

Source/cmMakefileTargetGenerator.cxx

@@ -1193,13 +1193,7 @@ void cmMakefileTargetGenerator
   depends.push_back(source.GetFullPath());
   if(const char* objectDeps = source.GetProperty("OBJECT_DEPENDS"))
     {
-    std::vector<std::string> deps;
+    cmSystemTools::ExpandListArgument(objectDeps, depends);
-    cmSystemTools::ExpandListArgument(objectDeps, deps);
-    for(std::vector<std::string>::iterator i = deps.begin();
-        i != deps.end(); ++i)
-      {
-      depends.push_back(*i);
-      }
     }
 }
 

Source/cmQtAutoGenerators.cxx

@@ -2368,14 +2368,7 @@ bool cmQtAutoGenerators::GenerateQrc()
               = this->RccOptions.find(*si);
       if (optionIt != this->RccOptions.end())
         {
-        std::vector<std::string> opts;
+        cmSystemTools::ExpandListArgument(optionIt->second, command);
-        cmSystemTools::ExpandListArgument(optionIt->second, opts);
-        for(std::vector<std::string>::const_iterator optIt = opts.begin();
-            optIt != opts.end();
-            ++optIt)
-          {
-          command.push_back(*optIt);
-          }
         }
 
       command.push_back("-name");