[cmake-commits] king committed cmGlobalXCodeGenerator.cxx 1.153 1.154

cmake-commits at cmake.org cmake-commits at cmake.org
Wed May 23 17:21:11 EDT 2007


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

Modified Files:
	cmGlobalXCodeGenerator.cxx 
Log Message:
BUG: Need to use GetRealDependency for custom command file-level dependencies.


Index: cmGlobalXCodeGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalXCodeGenerator.cxx,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -d -r1.153 -r1.154
--- cmGlobalXCodeGenerator.cxx	23 May 2007 19:40:12 -0000	1.153
+++ cmGlobalXCodeGenerator.cxx	23 May 2007 21:21:08 -0000	1.154
@@ -1029,24 +1029,11 @@
           cc.GetDepends().begin();
           d != cc.GetDepends().end(); ++d)
         {
-        if(!this->FindTarget(this->CurrentProject.c_str(), d->c_str(), false))
-          {
-          // if the depend is not a target but
-          // is a full path then use it, if not then
-          // just skip it
-          if(cmSystemTools::FileIsFullPath(d->c_str()))
-            {
-            makefileStream << "\\\n" << this
-                ->ConvertToRelativeForMake(d->c_str());
-            }
-          }
-        else
-          {
-          // if the depend is a target then make 
-          // the target with the source that is a custom command
-          // depend on the that target via a AddUtility call
-          target.AddUtility(d->c_str());
-          }
+        std::string dep =
+          this->CurrentLocalGenerator->GetRealDependency(d->c_str(),
+                                                         configName);
+        makefileStream << "\\\n" << this
+          ->ConvertToRelativeForMake(dep.c_str());
         }
       makefileStream << "\n";
 



More information about the Cmake-commits mailing list