FIX: command now expands *all* args (found through FOREACH example)
This commit is contained in:
parent
b7177cec30
commit
b253a0644d
|
@ -32,17 +32,22 @@ bool cmAddExecutableCommand::InitialPass(std::vector<std::string> const& args)
|
||||||
m_Makefile->ExpandVariablesInString(exename);
|
m_Makefile->ExpandVariablesInString(exename);
|
||||||
|
|
||||||
++s;
|
++s;
|
||||||
|
bool use_win32 = false;
|
||||||
|
|
||||||
if (*s == "WIN32")
|
if (*s == "WIN32")
|
||||||
{
|
{
|
||||||
++s;
|
++s;
|
||||||
std::vector<std::string> srclists(s, args.end());
|
use_win32 = true;
|
||||||
m_Makefile->AddExecutable(exename.c_str(),srclists, true);
|
|
||||||
}
|
}
|
||||||
else
|
|
||||||
|
std::vector<std::string> srclists(s, args.end());
|
||||||
|
for(std::vector<std::string>::iterator j = srclists.begin();
|
||||||
|
j != srclists.end(); ++j)
|
||||||
{
|
{
|
||||||
std::vector<std::string> srclists(s, args.end());
|
m_Makefile->ExpandVariablesInString(*j);
|
||||||
m_Makefile->AddExecutable(exename.c_str(),srclists, false);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
m_Makefile->AddExecutable(exename.c_str(), srclists, use_win32);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue