[cmake-commits] alex committed cmLocalGenerator.cxx 1.228 1.229 cmTarget.cxx 1.150 1.151

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv562

Modified Files:
	cmLocalGenerator.cxx cmTarget.cxx 
Log Message:

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


Index: cmLocalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.cxx,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -d -r1.228 -r1.229
--- cmLocalGenerator.cxx	18 Jun 2007 15:59:23 -0000	1.228
+++ cmLocalGenerator.cxx	21 Jun 2007 17:08:22 -0000	1.229
@@ -1964,7 +1964,7 @@
     }
 
   // 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
     // found is part of the inName

Index: cmTarget.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmTarget.cxx,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -d -r1.150 -r1.151
--- cmTarget.cxx	18 Jun 2007 15:59:23 -0000	1.150
+++ cmTarget.cxx	21 Jun 2007 17:08:22 -0000	1.151
@@ -538,9 +538,9 @@
     util = cmSystemTools::GetFilenameWithoutLastExtension(util);
     }
 
-  // Check for a non-imported target with this name.
+  // Check for a target with this name.
   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,
     // then make sure it was not a full path to something else, and