BUG: fix for bug 4414, find targets in the global generator for set_target_properties and add_dependencies

This commit is contained in:
Bill Hoffman
2007-02-07 11:49:42 -05:00
parent f548dc4a06
commit cbe95dffcc
2 changed files with 15 additions and 13 deletions
+8 -5
View File
@@ -15,6 +15,8 @@
=========================================================================*/
#include "cmAddDependenciesCommand.h"
#include "cmLocalGenerator.h"
#include "cmGlobalGenerator.h"
// cmDependenciesCommand
bool cmAddDependenciesCommand::InitialPass(
@@ -28,14 +30,16 @@ bool cmAddDependenciesCommand::InitialPass(
std::string target_name = args[0];
cmTargets &tgts = this->Makefile->GetTargets();
if (tgts.find(target_name) != tgts.end())
cmTarget* target =
this->GetMakefile()->GetLocalGenerator()->
GetGlobalGenerator()->FindTarget(0, target_name.c_str());
if(target)
{
std::vector<std::string>::const_iterator s = args.begin();
++s;
++s; // skip over target_name
for (; s != args.end(); ++s)
{
tgts[target_name].AddUtility(s->c_str());
target->AddUtility(s->c_str());
}
}
else
@@ -46,7 +50,6 @@ bool cmAddDependenciesCommand::InitialPass(
return false;
}
return true;
}