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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/cmAddDependenciesCommand.cxx
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;
}

15
Source/cmSetTargetPropertiesCommand.cxx
View File

@ -15,6 +15,8 @@
=========================================================================*/
#include "cmSetTargetPropertiesCommand.h"
#include "cmLocalGenerator.h"
#include "cmGlobalGenerator.h"
// cmSetTargetPropertiesCommand
bool cmSetTargetPropertiesCommand::InitialPass(
@ -93,19 +95,16 @@ bool cmSetTargetPropertiesCommand
std::vector<std::string> &propertyPairs,
cmMakefile *mf)
{
cmTargets& targets = mf->GetTargets();
// if the file is already in the makefile just set properites on it
cmTargets::iterator t = targets.find(tname);
if ( t != targets.end())
cmTarget* target =
mf->GetLocalGenerator()->GetGlobalGenerator()->FindTarget(0, tname);
if ( target)
{
cmTarget& target = t->second;
// now loop through all the props and set them
unsigned int k;
for (k = 0; k < propertyPairs.size(); k = k + 2)
{
target.SetProperty(propertyPairs[k].c_str(),
propertyPairs[k+1].c_str());
target->SetProperty(propertyPairs[k].c_str(),
propertyPairs[k+1].c_str());
}
}
// if file is not already in the makefile, then add it