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

BUG: handle dependencies to imported targets better: don't create a 

dependency if the target name was not listed in DEPENDS, if it was listed in
DEPENDS, create a dependency to the file

Seems to work, but have to check with Brad.

Alex
This commit is contained in:
Alexander Neundorf 2007-06-21 13:08:22 -04:00
parent 6e5b543c52
commit e126db1f71
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmLocalGenerator.cxx
View File

@ -1964,7 +1964,7 @@ std::string cmLocalGenerator::GetRealDependency(const char* inName,
} }
// Look for a CMake target with the given name. // Look for a CMake target with the given name.
if(cmTarget* target = this->GlobalGenerator->FindTarget(0,name.c_str(),false)) if(cmTarget* target = this->GlobalGenerator->FindTarget(0,name.c_str(),true))
{ {
// make sure it is not just a coincidence that the target name // make sure it is not just a coincidence that the target name
// found is part of the inName // found is part of the inName

4
Source/cmTarget.cxx
View File

@ -538,9 +538,9 @@ bool cmTargetTraceDependencies::IsUtility(std::string const& dep)
util = cmSystemTools::GetFilenameWithoutLastExtension(util); util = cmSystemTools::GetFilenameWithoutLastExtension(util);
} }
// Check for a non-imported target with this name. // Check for a target with this name.
if(cmTarget* t = if(cmTarget* t =
this->GlobalGenerator->FindTarget(0, util.c_str(), false)) this->GlobalGenerator->FindTarget(0, util.c_str(), true))
{ {
// If we find the target and the dep was given as a full path, // If we find the target and the dep was given as a full path,
// then make sure it was not a full path to something else, and // then make sure it was not a full path to something else, and