make sure ; expansion is done in all commands

Source/cmAbstractFilesCommand.cxx

@@ -17,13 +17,16 @@
 #include "cmAbstractFilesCommand.h"
 
 // cmAbstractFilesCommand
-bool cmAbstractFilesCommand::InitialPass(std::vector<std::string> const& args)
+bool cmAbstractFilesCommand::InitialPass(std::vector<std::string> const& argsIn)
 {
-  if(args.size() < 1 )
+  if(argsIn.size() < 1 )
     {
     this->SetError("called with incorrect number of arguments");
     return false;
     }
+  std::vector<std::string> args;
+  cmSystemTools::ExpandListArguments(argsIn, args);
+
   bool ret = true;
   std::string m = "could not find source file(s):\n";
 

Source/cmAddCustomCommandCommand.cxx

@@ -18,17 +18,19 @@
 
 
 // cmAddCustomCommandCommand
-bool cmAddCustomCommandCommand::InitialPass(std::vector<std::string> const& args)
+bool cmAddCustomCommandCommand::InitialPass(std::vector<std::string> const& argsIn)
 {
   /* Let's complain at the end of this function about the lack of a particular
      arg. For the moment, let's say that SOURCE, COMMAND, TARGET are always 
      required.
   */
-  if (args.size() < 6)
+  if (argsIn.size() < 6)
     {
       this->SetError("called with wrong number of arguments.");
       return false;
     }
+  std::vector<std::string> args;
+  cmSystemTools::ExpandListArguments(argsIn, args);
 
   std::string source, command, target;
   std::vector<std::string> command_args, depends, outputs;

Source/cmAddCustomTargetCommand.cxx

@@ -17,15 +17,17 @@
 #include "cmAddCustomTargetCommand.h"
 
 // cmAddCustomTargetCommand
-bool cmAddCustomTargetCommand::InitialPass(std::vector<std::string> const& args)
+bool cmAddCustomTargetCommand::InitialPass(std::vector<std::string> const& argsIn)
 {
   bool all = false;
   
-  if(args.size() < 2 )
+  if(argsIn.size() < 2 )
     {
     this->SetError("called with incorrect number of arguments");
     return false;
     }
+  std::vector<std::string> args;
+  cmSystemTools::ExpandListArguments(argsIn, args);
 
   // all target option
   std::string arguments;

Source/cmAddDefinitionsCommand.cxx

@@ -17,13 +17,16 @@
 #include "cmAddDefinitionsCommand.h"
 
 // cmAddDefinitionsCommand
-bool cmAddDefinitionsCommand::InitialPass(std::vector<std::string> const& args)
+bool cmAddDefinitionsCommand::InitialPass(std::vector<std::string> const& argsIn)
 {
-  if(args.size() < 1 )
+  if(argsIn.size() < 1 )
     {
     this->SetError("called with incorrect number of arguments");
     return false;
     }
+  std::vector<std::string> args;
+  cmSystemTools::ExpandListArguments(argsIn, args);
+
   for(std::vector<std::string>::const_iterator i = args.begin();
       i != args.end(); ++i)
     {

Source/cmAddDependenciesCommand.cxx

@@ -18,14 +18,16 @@
 #include "cmCacheManager.h"
 
 // cmDependenciesCommand
-bool cmAddDependenciesCommand::InitialPass(std::vector<std::string> const& args)
+bool cmAddDependenciesCommand::InitialPass(std::vector<std::string> const& argsIn)
 {
-  if(args.size() < 2 )
+  if(argsIn.size() < 2 )
     {
     this->SetError("called with incorrect number of arguments");
     return false;
     }
-  
+  std::vector<std::string> args;
+  cmSystemTools::ExpandListArguments(argsIn, args);
+
   std::string target_name = args[0];
 
   cmTargets &tgts = m_Makefile->GetTargets();

Source/cmAddTestCommand.cxx

@@ -34,13 +34,7 @@ bool cmAddTestCommand::InitialPass(std::vector<std::string> const& args)
   // also expand any CMake variables
 
   m_Args.erase(m_Args.begin(), m_Args.end());
-  std::string temp;
-  for (std::vector<std::string>::const_iterator j = args.begin(); 
-       j != args.end(); ++j)
-    {
-    m_Args.push_back(*j);
-    }
-  
+  cmSystemTools::ExpandListArguments(args, m_Args);
   return true;
 }
 

Source/cmCableClassSetCommand.cxx

@@ -19,13 +19,15 @@
 #include "cmTarget.h"
 
 // cmCableClassSetCommand
-bool cmCableClassSetCommand::InitialPass(std::vector<std::string> const& args)
+bool cmCableClassSetCommand::InitialPass(std::vector<std::string> const& argsIn)
 {
-  if(args.size() < 2)
+  if(argsIn.size() < 2)
     {
     this->SetError("called with incorrect number of arguments");
     return false;
     }
+  std::vector<std::string> args;
+  cmSystemTools::ExpandListArguments(argsIn, args);
 
   // The first argument is the name of the set.
   std::vector<std::string>::const_iterator arg = args.begin();

Source/cmCableWrapTclCommand.cxx

@@ -122,17 +122,19 @@ cmCableWrapTclCommand::~cmCableWrapTclCommand()
 
 
 // cmCableWrapTclCommand
-bool cmCableWrapTclCommand::InitialPass(std::vector<std::string> const& args)
+bool cmCableWrapTclCommand::InitialPass(std::vector<std::string> const& argsIn)
 {
-  if(args.size() < 2)
+  if(argsIn.size() < 2)
     {
     this->SetError("called with incorrect number of arguments");
     return false;
     }
+  std::vector<std::string> args;
+  cmSystemTools::ExpandListArguments(argsIn, args);
 
   // Prepare to iterate through the arguments.
   std::vector<std::string>::const_iterator arg = args.begin();
-  
+
   // The first argument is the name of the target.
   m_TargetName = *arg++;
   

Source/cmCommands.cxx

@@ -68,7 +68,6 @@
 #include "cmSetSourceFilesPropertiesCommand.cxx"
 #include "cmSiteNameCommand.cxx"
 #include "cmSourceFilesCommand.cxx"
-#include "cmSourceFilesFlagsCommand.cxx"
 #include "cmSourceFilesRemoveCommand.cxx"
 #include "cmSourceGroupCommand.cxx"
 #include "cmSubdirCommand.cxx"
@@ -137,7 +136,6 @@ void GetPredefinedCommands(std::list<cmCommand*>& commands)
   commands.push_back(new cmSetSourceFilesPropertiesCommand);
   commands.push_back(new cmSiteNameCommand);
   commands.push_back(new cmSourceFilesCommand);
-  commands.push_back(new cmSourceFilesFlagsCommand);
   commands.push_back(new cmSourceFilesRemoveCommand);
   commands.push_back(new cmSourceGroupCommand);
   commands.push_back(new cmSubdirCommand);

Source/cmCreateTestSourceList.cxx

@@ -27,7 +27,7 @@ bool cmCreateTestSourceList::InitialPass(std::vector<std::string> const& argsIn)
     }
 
   std::vector<std::string> args;
-  cmSystemTools::ExpandListArguments(argsIn, args, true);
+  cmSystemTools::ExpandListArguments(argsIn, args);
   
   std::vector<std::string>::iterator i = args.begin();
 

Source/cmFLTKWrapUICommand.cxx

@@ -19,7 +19,7 @@
 // cmFLTKWrapUICommand
 bool cmFLTKWrapUICommand::InitialPass(std::vector<std::string> const& args)
 {
-  if(args.size() < 2 )
+  if(args.size() != 2 )
     {
     this->SetError("called with incorrect number of arguments");
     return false;

Source/cmFindFileCommand.cxx

@@ -31,12 +31,12 @@ bool cmFindFileCommand::InitialPass(std::vector<std::string> const& argsIn)
   std::string helpString = "Where can the ";
   helpString += argsIn[1] + " file be found";
   size_t size = argsIn.size();
-  std::vector<std::string> args;
+  std::vector<std::string> argst;
   for(unsigned int j = 0; j < size; ++j)
     {
     if(argsIn[j] != "DOC")
       {
-      args.push_back(argsIn[j]);
+      argst.push_back(argsIn[j]);
       }
     else
       {
@@ -47,6 +47,9 @@ bool cmFindFileCommand::InitialPass(std::vector<std::string> const& argsIn)
       break;
       }
     }
+  std::vector<std::string> args;
+  cmSystemTools::ExpandListArguments(argst, args);
+
   std::vector<std::string>::const_iterator i = args.begin();
   // Use the first argument as the name of something to be defined
   const char* define = (*i).c_str();

Source/cmFindLibraryCommand.cxx

@@ -27,12 +27,12 @@ bool cmFindLibraryCommand::InitialPass(std::vector<std::string> const& argsIn)
     } 
   std::string helpString;
   size_t size = argsIn.size();
-  std::vector<std::string> args;
+  std::vector<std::string> argst;
   for(unsigned int j = 0; j < size; ++j)
     {
     if(argsIn[j] != "DOC")
       {
-      args.push_back(argsIn[j]);
+      argst.push_back(argsIn[j]);
       }
     else
       {
@@ -43,6 +43,8 @@ bool cmFindLibraryCommand::InitialPass(std::vector<std::string> const& argsIn)
       break;
       }
     }
+  std::vector<std::string> args;
+  cmSystemTools::ExpandListArguments(argst, args);
 
   std::vector<std::string> path;
   std::vector<std::string> names;

Source/cmFindPathCommand.cxx

@@ -30,13 +30,13 @@ bool cmFindPathCommand::InitialPass(std::vector<std::string> const& argsIn)
   // already, if so use that value and don't look for the program
   std::string helpString = "What is the path where the file ";
   helpString += argsIn[1] + " can be found";
-  std::vector<std::string> args;
+  std::vector<std::string> argst;
   size_t size = argsIn.size();
   for(unsigned int j = 0; j < size; ++j)
     {
     if(argsIn[j] != "DOC")
       {
-      args.push_back(argsIn[j]);
+      argst.push_back(argsIn[j]);
       }
     else
       {
@@ -47,6 +47,9 @@ bool cmFindPathCommand::InitialPass(std::vector<std::string> const& argsIn)
       break;
       }
     }
+  std::vector<std::string> args;
+  cmSystemTools::ExpandListArguments(argst, args);
+
   const char* cacheValue
     = m_Makefile->GetDefinition(args[0].c_str());
   if(cacheValue && strcmp(cacheValue, "NOTFOUND"))

Source/cmFindProgramCommand.cxx

@@ -30,12 +30,12 @@ bool cmFindProgramCommand::InitialPass(std::vector<std::string> const& argsIn)
     }
   std::string doc = "Path to a program.";
   size_t size = argsIn.size();
-  std::vector<std::string> args;
+  std::vector<std::string> argst;
   for(unsigned int j = 0; j < size; ++j)
     {
     if(argsIn[j] != "DOC")
       {
-      args.push_back(argsIn[j]);
+      argst.push_back(argsIn[j]);
       }
     else
       {
@@ -46,6 +46,10 @@ bool cmFindProgramCommand::InitialPass(std::vector<std::string> const& argsIn)
       break;
       }
     }
+  std::vector<std::string> args;
+  cmSystemTools::ExpandListArguments(argst, args);
+
+
   std::vector<std::string>::iterator i = args.begin();
   // Use the first argument as the name of something to be defined
   const char* define = (*i).c_str();

Source/cmGetSourceFilePropertyCommand.cxx

@@ -20,7 +20,7 @@
 bool cmGetSourceFilePropertyCommand::InitialPass(std::vector<std::string> const& 
                                                  args)
 {
-  if(args.size() < 3 )
+  if(args.size() != 3 )
     {
     this->SetError("called with incorrect number of arguments");
     return false;
@@ -38,7 +38,7 @@ bool cmGetSourceFilePropertyCommand::InitialPass(std::vector<std::string> const&
       {
       m_Makefile->AddDefinition(var, sf->GetWrapExclude());
       }
-    if(args[2] == "FLAGS")
+    if(args[2] == "COMPILE_FLAGS")
       {
       m_Makefile->AddDefinition(var, sf->GetCompileFlags());
       }

Source/cmGetSourceFilePropertyCommand.h

@@ -53,7 +53,7 @@ public:
   virtual const char* GetFullDocumentation()
     {
       return
-        "GET_SOURCE_FILE_PROPERTY(VAR file [ABSTRACT|WRAP_EXCLUDE|FLAGS]) "
+        "GET_SOURCE_FILE_PROPERTY(VAR file [ABSTRACT|WRAP_EXCLUDE|COMPILE_FLAGS]) "
         "Get a property from a source file.   The value of the property is stored  "
         "in the variable VAR.";
     }

Source/cmIncludeDirectoryCommand.cxx

@@ -17,13 +17,15 @@
 #include "cmIncludeDirectoryCommand.h"
 #include "cmCacheManager.h"
 // cmIncludeDirectoryCommand
-bool cmIncludeDirectoryCommand::InitialPass(std::vector<std::string> const& args)
+bool cmIncludeDirectoryCommand::InitialPass(std::vector<std::string> const& argsIn)
 {
-  if(args.size() < 1 )
+  if(argsIn.size() < 1 )
     {
     this->SetError("called with incorrect number of arguments");
     return false;
     }
+  std::vector<std::string> args;
+  cmSystemTools::ExpandListArguments(argsIn, args);
 
   std::vector<std::string>::const_iterator i = args.begin();
 

Source/cmInstallFilesCommand.cxx

@@ -18,13 +18,15 @@
 #include "cmCacheManager.h"
 
 // cmExecutableCommand
-bool cmInstallFilesCommand::InitialPass(std::vector<std::string> const& args)
+bool cmInstallFilesCommand::InitialPass(std::vector<std::string> const& argsIn)
 {
-  if(args.size() < 2)
+  if(argsIn.size() < 2)
     {
     this->SetError("called with incorrect number of arguments");
     return false;
     }
+  std::vector<std::string> args;
+  cmSystemTools::ExpandListArguments(argsIn, args);
 
   // Create an INSTALL_FILES target specifically for this path.
   m_TargetName = "INSTALL_FILES_"+args[0];

Source/cmInstallProgramsCommand.cxx

@@ -18,13 +18,15 @@
 #include "cmCacheManager.h"
 
 // cmExecutableCommand
-bool cmInstallProgramsCommand::InitialPass(std::vector<std::string> const& args)
+bool cmInstallProgramsCommand::InitialPass(std::vector<std::string> const& argsIn)
 {
-  if(args.size() < 2)
+  if(argsIn.size() < 2)
     {
     this->SetError("called with incorrect number of arguments");
     return false;
     }
+  std::vector<std::string> args;
+  cmSystemTools::ExpandListArguments(argsIn, args);
 
   // Create an INSTALL_PROGRAMS target specifically for this path.
   m_TargetName = "INSTALL_PROGRAMS_"+args[0];

Source/cmInstallTargetsCommand.cxx

@@ -18,13 +18,15 @@
 #include "cmCacheManager.h"
 
 // cmExecutableCommand
-bool cmInstallTargetsCommand::InitialPass(std::vector<std::string> const& args)
+bool cmInstallTargetsCommand::InitialPass(std::vector<std::string> const& argsIn)
 {
-  if(args.size() < 2 )
+  if(argsIn.size() < 2 )
     {
     this->SetError("called with incorrect number of arguments");
     return false;
     }
+  std::vector<std::string> args;
+  cmSystemTools::ExpandListArguments(argsIn, args);
 
   cmTargets &tgts = m_Makefile->GetTargets();
   std::vector<std::string>::const_iterator s = args.begin();

Source/cmLinkDirectoriesCommand.cxx

@@ -17,13 +17,16 @@
 #include "cmLinkDirectoriesCommand.h"
 
 // cmLinkDirectoriesCommand
-bool cmLinkDirectoriesCommand::InitialPass(std::vector<std::string> const& args)
+bool cmLinkDirectoriesCommand::InitialPass(std::vector<std::string> const& argsIn)
 {
- if(args.size() < 1 )
+ if(argsIn.size() < 1 )
     {
     this->SetError("called with incorrect number of arguments");
     return false;
     }
+ std::vector<std::string> args;
+ cmSystemTools::ExpandListArguments(argsIn, args);
+
   for(std::vector<std::string>::const_iterator i = args.begin();
       i != args.end(); ++i)
     {

Source/cmLoadCacheCommand.cxx

@@ -18,13 +18,15 @@
 
 
 // cmLoadcacheCommand
-bool cmLoadCacheCommand::InitialPass(std::vector<std::string> const& args)
+bool cmLoadCacheCommand::InitialPass(std::vector<std::string> const& argsIn)
 {
-  if (args.size()< 1)
+  if (argsIn.size()< 1)
     {
     this->SetError("called with wrong number of arguments.");
     }
-  
+  std::vector<std::string> args;
+  cmSystemTools::ExpandListArguments(argsIn, args);
+
   // Cache entries to be excluded from the import list.
   // If this set is empty, all cache entries are brought in
   // and they can not be overridden.

Source/cmMakeDirectoryCommand.cxx

@@ -20,7 +20,7 @@
 // cmMakeDirectoryCommand
 bool cmMakeDirectoryCommand::InitialPass(std::vector<std::string> const& args)
 {
-  if(args.size() < 1 )
+  if(args.size() != 1 )
     {
     this->SetError("called with incorrect number of arguments");
     return false;

Source/cmMarkAsAdvancedCommand.cxx

@@ -17,13 +17,16 @@
 #include "cmMarkAsAdvancedCommand.h"
 
 // cmMarkAsAdvancedCommand
-bool cmMarkAsAdvancedCommand::InitialPass(std::vector<std::string> const& args)
+bool cmMarkAsAdvancedCommand::InitialPass(std::vector<std::string> const& argsIn)
 {
-  if(args.size() < 1 )
+  if(argsIn.size() < 1 )
     {
     this->SetError("called with incorrect number of arguments");
     return false;
     }
+  std::vector<std::string> args;
+  cmSystemTools::ExpandListArguments(argsIn, args);
+
   unsigned int i =0;
   const char* value = "1";
   bool overwrite = false;

Source/cmOutputRequiredFilesCommand.cxx

@@ -159,7 +159,7 @@ void cmLBDepend::DependWalk(cmDependInformation* info)
 // cmOutputRequiredFilesCommand
 bool cmOutputRequiredFilesCommand::InitialPass(std::vector<std::string> const& args)
 {
-  if(args.size() < 2 )
+  if(args.size() != 2 )
     {
     this->SetError("called with incorrect number of arguments");
     return false;

Source/cmProjectCommand.cxx

@@ -19,7 +19,7 @@
 // cmProjectCommand
 bool cmProjectCommand::InitialPass(std::vector<std::string> const& args)
 {
-  if(args.size() < 1 || args.size() > 1)
+  if(args.size() != 1 )
     {
     this->SetError("PROJECT called with incorrect number of arguments");
     return false;

Source/cmQTWrapCPPCommand.cxx

@@ -17,13 +17,15 @@
 #include "cmQTWrapCPPCommand.h"
 
 // cmQTWrapCPPCommand
-bool cmQTWrapCPPCommand::InitialPass(std::vector<std::string> const& args)
+bool cmQTWrapCPPCommand::InitialPass(std::vector<std::string> const& argsIn)
 {
-  if(args.size() < 3 )
+  if(argsIn.size() < 3 )
     {
     this->SetError("called with incorrect number of arguments");
     return false;
     }
+  std::vector<std::string> args;
+  cmSystemTools::ExpandListArguments(argsIn, args);
 
   // Now check and see if the value has been stored in the cache
   // already, if so use that value and don't look for the program

Source/cmQTWrapUICommand.cxx

@@ -17,13 +17,15 @@
 #include "cmQTWrapUICommand.h"
 
 // cmQTWrapUICommand
-bool cmQTWrapUICommand::InitialPass(std::vector<std::string> const& args)
+bool cmQTWrapUICommand::InitialPass(std::vector<std::string> const& argsIn)
 {
-  if(args.size() < 4 )
+  if(argsIn.size() < 4 )
     {
     this->SetError("called with incorrect number of arguments");
     return false;
     }
+  std::vector<std::string> args;
+  cmSystemTools::ExpandListArguments(argsIn, args);
 
   // Now check and see if the value has been stored in the cache
   // already, if so use that value and don't look for the program

Source/cmSetSourceFilesPropertiesCommand.cxx

@@ -18,14 +18,16 @@
 
 // cmSetSourceFilesPropertiesCommand
 bool cmSetSourceFilesPropertiesCommand::InitialPass(std::vector<std::string> const& 
-                                                 args)
+                                                 argsIn)
 {
-  if(args.size() < 2 )
+  if(argsIn.size() < 2 )
     {
     this->SetError("called with incorrect number of arguments");
     return false;
     }
-  
+  std::vector<std::string> args;
+  cmSystemTools::ExpandListArguments(argsIn, args);
+
   std::vector<std::string>::const_iterator j;
   // first collect up all the flags that need to be set on the file
   bool abstract = false;
@@ -46,7 +48,7 @@ bool cmSetSourceFilesPropertiesCommand::InitialPass(std::vector<std::string> con
       {
       generated = true;
       }
-    else if(*j == "FLAGS")
+    else if(*j == "COMPILE_FLAGS")
       {
       ++j;
       if(j == args.end())
@@ -61,7 +63,7 @@ bool cmSetSourceFilesPropertiesCommand::InitialPass(std::vector<std::string> con
   for(j = args.begin(); j != args.end(); ++j)
     {   
     // at the sign of the first property exit the loop
-    if(*j == "ABSTRACT" || *j == "WRAP_EXCLUDE" || *j == "FLAGS")
+    if(*j == "ABSTRACT" || *j == "WRAP_EXCLUDE" || *j == "COMPILE_FLAGS")
       {
       break;
       }

Source/cmSetSourceFilesPropertiesCommand.h

@@ -53,7 +53,7 @@ public:
   virtual const char* GetFullDocumentation()
     {
       return
-        "SET_SOURCE_FILES_PROPERTIES(flags file1 file2 [ABSTRACT|WRAP_EXCLUDE|GENERATED|FLAGS] [flags]) "
+        "SET_SOURCE_FILES_PROPERTIES(flags file1 file2 [ABSTRACT|WRAP_EXCLUDE|GENERATED|COMPILE_FLAGS] [flags]) "
         "Set properties on a file.   The syntax for the command is to list all the files you want "
         "to change, and then provide the values you want to set next.";
     }

Source/cmSiteNameCommand.cxx

@@ -19,7 +19,7 @@