summaryrefslogtreecommitdiffstats
path: root/Source/cmSetSourceFilesPropertiesCommand.cxx
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2002-03-29 19:20:32 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2002-03-29 19:20:32 (GMT)
commit7d76de4403480dc607261c5a1067a24c667faeeb (patch)
tree4e5d4464a62b46cb6f0b151f481634259aa4b895 /Source/cmSetSourceFilesPropertiesCommand.cxx
parent0223ba91f3aad2014df152612a805d3feb676ddb (diff)
downloadCMake-7d76de4403480dc607261c5a1067a24c667faeeb.zip
CMake-7d76de4403480dc607261c5a1067a24c667faeeb.tar.gz
CMake-7d76de4403480dc607261c5a1067a24c667faeeb.tar.bz2
make sure ; expansion is done in all commands
Diffstat (limited to 'Source/cmSetSourceFilesPropertiesCommand.cxx')
-rw-r--r--Source/cmSetSourceFilesPropertiesCommand.cxx12
1 files changed, 7 insertions, 5 deletions
diff --git a/Source/cmSetSourceFilesPropertiesCommand.cxx b/Source/cmSetSourceFilesPropertiesCommand.cxx
index 06581eb..f065b45 100644
--- a/Source/cmSetSourceFilesPropertiesCommand.cxx
+++ b/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;
}