[Cmake-commits] [cmake-commits] king committed cmLocalGenerator.cxx 1.279 1.280

[cmake-commits at cmake.org]

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

Modified Files:
	cmLocalGenerator.cxx 
Log Message:
BUG: Custom command depends may match sources

Custom command dependencies that are not full paths or targets may also
match source files.  When one does, the full information about the
source file's location and name may be used.  This fixes the case when a
custom commands depends by relative path on a source file generated by
another custom command specifying its output by relative path.


Index: cmLocalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.cxx,v
retrieving revision 1.279
retrieving revision 1.280
diff -C 2 -d -r1.279 -r1.280
*** cmLocalGenerator.cxx	5 Aug 2008 13:55:08 -0000	1.279
--- cmLocalGenerator.cxx	5 Aug 2008 17:27:06 -0000	1.280
***************
*** 1741,1744 ****
--- 1741,1753 ----
      return inName;
      }
+ 
+   // Check for a source file in this directory that matches the
+   // dependency.
+   if(cmSourceFile* sf = this->Makefile->GetSource(inName))
+     {
+     name = sf->GetFullPath();
+     return name;
+     }
+ 
    // Treat the name as relative to the source directory in which it
    // was given.