parent
3aa23ce6eb
commit
e4b5de6377
|
@ -906,7 +906,7 @@ cmGlobalXCodeGenerator::AddCommandsToBuildPhase(cmXCodeObject* buildphase,
|
||||||
std::string primaryOutput = this->ConvertToRelativeForMake(o->c_str());
|
std::string primaryOutput = this->ConvertToRelativeForMake(o->c_str());
|
||||||
for(++o; o != outputs.end(); ++o)
|
for(++o; o != outputs.end(); ++o)
|
||||||
{
|
{
|
||||||
std::string currentOutput =this->ConvertToRelativeForMake(o->c_str());
|
std::string currentOutput=this->ConvertToRelativeForMake(o->c_str());
|
||||||
multipleOutputPairs[currentOutput] = primaryOutput;
|
multipleOutputPairs[currentOutput] = primaryOutput;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -940,7 +940,8 @@ cmGlobalXCodeGenerator::AddCommandsToBuildPhase(cmXCodeObject* buildphase,
|
||||||
std::string makecmd = "make -C ";
|
std::string makecmd = "make -C ";
|
||||||
makecmd += cdir;
|
makecmd += cdir;
|
||||||
makecmd += " -f ";
|
makecmd += " -f ";
|
||||||
makecmd += this->ConvertToRelativeForMake((makefile+"$CONFIGURATION").c_str());
|
makecmd += this->ConvertToRelativeForMake(
|
||||||
|
(makefile+"$CONFIGURATION").c_str());
|
||||||
if(!multipleOutputPairs.empty())
|
if(!multipleOutputPairs.empty())
|
||||||
{
|
{
|
||||||
makecmd += " cmake_check_multiple_outputs";
|
makecmd += " cmake_check_multiple_outputs";
|
||||||
|
|
|
@ -618,7 +618,8 @@ cmLocalVisualStudio6Generator
|
||||||
}
|
}
|
||||||
// Write out the dependencies for the rule.
|
// Write out the dependencies for the rule.
|
||||||
fout << "USERDEP__HACK=";
|
fout << "USERDEP__HACK=";
|
||||||
for(std::vector<std::string>::const_iterator d=command.GetDepends().begin();
|
for(std::vector<std::string>::const_iterator d =
|
||||||
|
command.GetDepends().begin();
|
||||||
d != command.GetDepends().end();
|
d != command.GetDepends().end();
|
||||||
++d)
|
++d)
|
||||||
{
|
{
|
||||||
|
|
|
@ -410,15 +410,17 @@ void cmTarget::SetMakefile(cmMakefile* mf)
|
||||||
|
|
||||||
|
|
||||||
void
|
void
|
||||||
cmTarget::CheckForTargetsAsCommand(const std::vector<cmCustomCommand>& commands)
|
cmTarget
|
||||||
|
::CheckForTargetsAsCommand(const std::vector<cmCustomCommand>& commands)
|
||||||
{
|
{
|
||||||
for ( std::vector<cmCustomCommand>::const_iterator cli = commands.begin();
|
for ( std::vector<cmCustomCommand>::const_iterator cli = commands.begin();
|
||||||
cli != commands.end();
|
cli != commands.end();
|
||||||
++cli )
|
++cli )
|
||||||
{
|
{
|
||||||
for(cmCustomCommandLines::const_iterator cit=cli->GetCommandLines().begin();
|
for(cmCustomCommandLines::const_iterator cit =
|
||||||
cit!=cli->GetCommandLines().end();
|
cli->GetCommandLines().begin();
|
||||||
++cit )
|
cit!=cli->GetCommandLines().end();
|
||||||
|
++cit )
|
||||||
{
|
{
|
||||||
std::string command = *cit->begin();
|
std::string command = *cit->begin();
|
||||||
// see if we can find a target with this name
|
// see if we can find a target with this name
|
||||||
|
|
Loading…
Reference in New Issue