ENH: improve SetProperties and fix a couple warnings
This commit is contained in:
parent
09029e9cd8
commit
179579bed7
|
@ -17,6 +17,7 @@
|
||||||
#include "cmSetPropertiesCommand.h"
|
#include "cmSetPropertiesCommand.h"
|
||||||
#include "cmSetTargetPropertiesCommand.h"
|
#include "cmSetTargetPropertiesCommand.h"
|
||||||
#include "cmSetTestsPropertiesCommand.h"
|
#include "cmSetTestsPropertiesCommand.h"
|
||||||
|
#include "cmSetSourceFilesPropertiesCommand.h"
|
||||||
|
|
||||||
// cmSetPropertiesCommand
|
// cmSetPropertiesCommand
|
||||||
bool cmSetPropertiesCommand::InitialPass(
|
bool cmSetPropertiesCommand::InitialPass(
|
||||||
|
@ -93,6 +94,11 @@ bool cmSetPropertiesCommand::InitialPass(
|
||||||
scope = cmProperty::TEST;
|
scope = cmProperty::TEST;
|
||||||
scopeName = args[1].c_str();
|
scopeName = args[1].c_str();
|
||||||
}
|
}
|
||||||
|
else if (args[0] == "SOURCE_FILE" && numFiles == 2)
|
||||||
|
{
|
||||||
|
scope = cmProperty::SOURCE_FILE;
|
||||||
|
scopeName = args[1].c_str();
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
this->SetError("called with illegal arguments.");
|
this->SetError("called with illegal arguments.");
|
||||||
|
@ -151,7 +157,19 @@ bool cmSetPropertiesCommand::InitialPass(
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case cmProperty::SOURCE_FILE:
|
case cmProperty::SOURCE_FILE:
|
||||||
// not implemented yet
|
{
|
||||||
|
std::string errors;
|
||||||
|
bool ret = cmSetSourceFilesPropertiesCommand::
|
||||||
|
RunCommand(this->Makefile,
|
||||||
|
args.begin()+1, args.begin()+2,
|
||||||
|
args.begin() + 2, args.end(),
|
||||||
|
errors);
|
||||||
|
if (!ret)
|
||||||
|
{
|
||||||
|
this->SetError(errors.c_str());
|
||||||
|
}
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -56,7 +56,8 @@ public:
|
||||||
" PROPERTIES prop1 value1\n"
|
" PROPERTIES prop1 value1\n"
|
||||||
" prop2 value2 ...)\n"
|
" prop2 value2 ...)\n"
|
||||||
"Set properties on something. The scope_value is either GLOBAL "
|
"Set properties on something. The scope_value is either GLOBAL "
|
||||||
"DIRECTORY dir_name, TARGET tgt_name, or TEST test_name."
|
"DIRECTORY dir_name, TARGET tgt_name, SOURCE_FILE src_name, "
|
||||||
|
"or TEST test_name."
|
||||||
;
|
;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -28,56 +28,89 @@ bool cmSetSourceFilesPropertiesCommand::InitialPass(
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// first collect up the list of files
|
// break the arguments into source file names and properties
|
||||||
std::vector<std::string> propertyPairs;
|
|
||||||
bool doingFiles = true;
|
|
||||||
bool generated = false;
|
|
||||||
int numFiles = 0;
|
int numFiles = 0;
|
||||||
std::vector<std::string>::const_iterator j;
|
std::vector<std::string>::const_iterator j;
|
||||||
for(j= args.begin(); j != args.end();++j)
|
j = args.begin();
|
||||||
|
// old style allows for specifier before PROPERTIES keyword
|
||||||
|
while (*j != "ABSTRACT" &&
|
||||||
|
*j != "WRAP_EXCLUDE" &&
|
||||||
|
*j != "GENERATED" &&
|
||||||
|
*j != "COMPILE_FLAGS" &&
|
||||||
|
*j != "OBJECT_DEPENDS" &&
|
||||||
|
*j != "PROPERTIES")
|
||||||
|
{
|
||||||
|
numFiles++;
|
||||||
|
++j;
|
||||||
|
}
|
||||||
|
|
||||||
|
// now call the worker function
|
||||||
|
std::string errors;
|
||||||
|
bool ret =
|
||||||
|
cmSetSourceFilesPropertiesCommand
|
||||||
|
::RunCommand(this->Makefile,
|
||||||
|
args.begin(),
|
||||||
|
args.begin() + numFiles,
|
||||||
|
args.begin() + numFiles,
|
||||||
|
args.end(), errors);
|
||||||
|
if (!ret)
|
||||||
|
{
|
||||||
|
this->SetError(errors.c_str());
|
||||||
|
}
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool cmSetSourceFilesPropertiesCommand
|
||||||
|
::RunCommand(cmMakefile *mf,
|
||||||
|
std::vector<std::string>::const_iterator filebeg,
|
||||||
|
std::vector<std::string>::const_iterator fileend,
|
||||||
|
std::vector<std::string>::const_iterator propbeg,
|
||||||
|
std::vector<std::string>::const_iterator propend,
|
||||||
|
std::string &errors)
|
||||||
|
{
|
||||||
|
std::vector<std::string> propertyPairs;
|
||||||
|
bool generated = false;
|
||||||
|
std::vector<std::string>::const_iterator j;
|
||||||
|
// build the property pairs
|
||||||
|
for(j= propbeg; j != propend;++j)
|
||||||
{
|
{
|
||||||
// old style allows for specifier before PROPERTIES keyword
|
// old style allows for specifier before PROPERTIES keyword
|
||||||
if(*j == "ABSTRACT")
|
if(*j == "ABSTRACT")
|
||||||
{
|
{
|
||||||
doingFiles = false;
|
|
||||||
propertyPairs.push_back("ABSTRACT");
|
propertyPairs.push_back("ABSTRACT");
|
||||||
propertyPairs.push_back("1");
|
propertyPairs.push_back("1");
|
||||||
}
|
}
|
||||||
else if(*j == "WRAP_EXCLUDE")
|
else if(*j == "WRAP_EXCLUDE")
|
||||||
{
|
{
|
||||||
doingFiles = false;
|
|
||||||
propertyPairs.push_back("WRAP_EXCLUDE");
|
propertyPairs.push_back("WRAP_EXCLUDE");
|
||||||
propertyPairs.push_back("1");
|
propertyPairs.push_back("1");
|
||||||
}
|
}
|
||||||
else if(*j == "GENERATED")
|
else if(*j == "GENERATED")
|
||||||
{
|
{
|
||||||
doingFiles = false;
|
|
||||||
generated = true;
|
generated = true;
|
||||||
propertyPairs.push_back("GENERATED");
|
propertyPairs.push_back("GENERATED");
|
||||||
propertyPairs.push_back("1");
|
propertyPairs.push_back("1");
|
||||||
}
|
}
|
||||||
else if(*j == "COMPILE_FLAGS")
|
else if(*j == "COMPILE_FLAGS")
|
||||||
{
|
{
|
||||||
doingFiles = false;
|
|
||||||
propertyPairs.push_back("COMPILE_FLAGS");
|
propertyPairs.push_back("COMPILE_FLAGS");
|
||||||
++j;
|
++j;
|
||||||
if(j == args.end())
|
if(j == propend)
|
||||||
{
|
{
|
||||||
this->SetError("called with incorrect number of arguments "
|
errors = "called with incorrect number of arguments "
|
||||||
"COMPILE_FLAGS with no flags");
|
"COMPILE_FLAGS with no flags";
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
propertyPairs.push_back(*j);
|
propertyPairs.push_back(*j);
|
||||||
}
|
}
|
||||||
else if(*j == "OBJECT_DEPENDS")
|
else if(*j == "OBJECT_DEPENDS")
|
||||||
{
|
{
|
||||||
doingFiles = false;
|
|
||||||
propertyPairs.push_back("OBJECT_DEPENDS");
|
propertyPairs.push_back("OBJECT_DEPENDS");
|
||||||
++j;
|
++j;
|
||||||
if(j == args.end())
|
if(j == propend)
|
||||||
{
|
{
|
||||||
this->SetError("called with incorrect number of arguments "
|
errors = "called with incorrect number of arguments "
|
||||||
"OBJECT_DEPENDS with no dependencies");
|
"OBJECT_DEPENDS with no dependencies";
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
propertyPairs.push_back(*j);
|
propertyPairs.push_back(*j);
|
||||||
|
@ -87,13 +120,13 @@ bool cmSetSourceFilesPropertiesCommand::InitialPass(
|
||||||
// now loop through the rest of the arguments, new style
|
// now loop through the rest of the arguments, new style
|
||||||
++j;
|
++j;
|
||||||
bool dontPush = false;
|
bool dontPush = false;
|
||||||
while (j != args.end())
|
while (j != propend)
|
||||||
{
|
{
|
||||||
propertyPairs.push_back(*j);
|
propertyPairs.push_back(*j);
|
||||||
if(*j == "GENERATED")
|
if(*j == "GENERATED")
|
||||||
{
|
{
|
||||||
++j;
|
++j;
|
||||||
if(j != args.end() && cmSystemTools::IsOn(j->c_str()))
|
if(j != propend && cmSystemTools::IsOn(j->c_str()))
|
||||||
{
|
{
|
||||||
generated = true;
|
generated = true;
|
||||||
}
|
}
|
||||||
|
@ -101,10 +134,10 @@ bool cmSetSourceFilesPropertiesCommand::InitialPass(
|
||||||
else if(*j == "MACOSX_PACKAGE_LOCATION")
|
else if(*j == "MACOSX_PACKAGE_LOCATION")
|
||||||
{
|
{
|
||||||
++j;
|
++j;
|
||||||
if(j == args.end())
|
if(j == propend)
|
||||||
{
|
{
|
||||||
this->SetError("called with incorrect number of arguments "
|
errors = "called with incorrect number of arguments "
|
||||||
"MACOSX_PACKAGE_LOCATION with no flags");
|
"MACOSX_PACKAGE_LOCATION with no flags";
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
propertyPairs.push_back(*j);
|
propertyPairs.push_back(*j);
|
||||||
|
@ -122,9 +155,9 @@ bool cmSetSourceFilesPropertiesCommand::InitialPass(
|
||||||
{
|
{
|
||||||
++j;
|
++j;
|
||||||
}
|
}
|
||||||
if(j == args.end())
|
if(j == propend)
|
||||||
{
|
{
|
||||||
this->SetError("called with incorrect number of arguments.");
|
errors = "called with incorrect number of arguments.";
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if ( !dontPush )
|
if ( !dontPush )
|
||||||
|
@ -137,29 +170,24 @@ bool cmSetSourceFilesPropertiesCommand::InitialPass(
|
||||||
// break out of the loop because j is already == end
|
// break out of the loop because j is already == end
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
else if (doingFiles)
|
|
||||||
{
|
|
||||||
numFiles++;
|
|
||||||
}
|
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
this->SetError("called with illegal arguments, maybe missing a "
|
errors = "called with illegal arguments, maybe missing a "
|
||||||
"PROPERTIES specifier?");
|
"PROPERTIES specifier?";
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// now loop over all the files
|
// now loop over all the files
|
||||||
int i;
|
for(j= filebeg; j != fileend;++j)
|
||||||
unsigned int k;
|
|
||||||
for(i = 0; i < numFiles; ++i)
|
|
||||||
{
|
{
|
||||||
// get the source file
|
// get the source file
|
||||||
cmSourceFile* sf =
|
cmSourceFile* sf =
|
||||||
this->Makefile->GetOrCreateSource(args[i].c_str(), generated);
|
mf->GetOrCreateSource(j->c_str(), generated);
|
||||||
if(sf)
|
if(sf)
|
||||||
{
|
{
|
||||||
// now loop through all the props and set them
|
// now loop through all the props and set them
|
||||||
|
unsigned int k;
|
||||||
for (k = 0; k < propertyPairs.size(); k = k + 2)
|
for (k = 0; k < propertyPairs.size(); k = k + 2)
|
||||||
{
|
{
|
||||||
sf->SetProperty(propertyPairs[k].c_str(),propertyPairs[k+1].c_str());
|
sf->SetProperty(propertyPairs[k].c_str(),propertyPairs[k+1].c_str());
|
||||||
|
|
|
@ -82,6 +82,13 @@ public:
|
||||||
}
|
}
|
||||||
|
|
||||||
cmTypeMacro(cmSetSourceFilesPropertiesCommand, cmCommand);
|
cmTypeMacro(cmSetSourceFilesPropertiesCommand, cmCommand);
|
||||||
|
|
||||||
|
static bool RunCommand(cmMakefile *mf,
|
||||||
|
std::vector<std::string>::const_iterator filebeg,
|
||||||
|
std::vector<std::string>::const_iterator fileend,
|
||||||
|
std::vector<std::string>::const_iterator propbeg,
|
||||||
|
std::vector<std::string>::const_iterator propend,
|
||||||
|
std::string &errors);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -2854,19 +2854,14 @@ bool cmake::IsPropertyChained(const char *name, cmProperty::ScopeType scope)
|
||||||
{
|
{
|
||||||
case cmProperty::GLOBAL:
|
case cmProperty::GLOBAL:
|
||||||
return this->GlobalProperties.IsPropertyChained(name);
|
return this->GlobalProperties.IsPropertyChained(name);
|
||||||
break;
|
|
||||||
case cmProperty::TARGET:
|
case cmProperty::TARGET:
|
||||||
return this->TargetProperties.IsPropertyChained(name);
|
return this->TargetProperties.IsPropertyChained(name);
|
||||||
break;
|
|
||||||
case cmProperty::SOURCE_FILE:
|
case cmProperty::SOURCE_FILE:
|
||||||
return this->SourceFileProperties.IsPropertyChained(name);
|
return this->SourceFileProperties.IsPropertyChained(name);
|
||||||
break;
|
|
||||||
case cmProperty::DIRECTORY:
|
case cmProperty::DIRECTORY:
|
||||||
return this->DirectoryProperties.IsPropertyChained(name);
|
return this->DirectoryProperties.IsPropertyChained(name);
|
||||||
break;
|
|
||||||
case cmProperty::TEST:
|
case cmProperty::TEST:
|
||||||
return this->DirectoryProperties.IsPropertyChained(name);
|
return this->DirectoryProperties.IsPropertyChained(name);
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
|
Loading…
Reference in New Issue