kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Overload cmLocalGenerator::AppendDefines to add a list.

Browse Source
This commit is contained in:
Stephen Kelly 2013-06-06 18:17:10 +02:00
parent a18e9586db
commit d95651e15a
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmLocalGenerator.cxx
View File

@ -2301,7 +2301,13 @@ void cmLocalGenerator::AppendDefines(std::set<std::string>& defines,
// Expand the list of definitions. // Expand the list of definitions.
std::vector<std::string> defines_vec; std::vector<std::string> defines_vec;
cmSystemTools::ExpandListArgument(defines_list, defines_vec); cmSystemTools::ExpandListArgument(defines_list, defines_vec);
this->AppendDefines(defines, defines_vec);
}
//----------------------------------------------------------------------------
void cmLocalGenerator::AppendDefines(std::set<std::string>& defines,
const std::vector<std::string> &defines_vec)
{
for(std::vector<std::string>::const_iterator di = defines_vec.begin(); for(std::vector<std::string>::const_iterator di = defines_vec.begin();
di != defines_vec.end(); ++di) di != defines_vec.end(); ++di)
{ {

3
Source/cmLocalGenerator.h
View File

@ -166,6 +166,9 @@ public:
{ {
this->AppendDefines(defines, defines_list.c_str()); this->AppendDefines(defines, defines_list.c_str());
} }
void AppendDefines(std::set<std::string>& defines,
const std::vector<std::string> &defines_vec);
/** /**
* Join a set of defines into a definesString with a space separator. * Join a set of defines into a definesString with a space separator.
*/ */