Explorar el Código

BUG: Need source file and OBJECT_DEPENDS as dependencies of an object file.

Brad King hace 23 años
padre
commit
4cbcd08594
Se han modificado 1 ficheros con 2 adiciones y 2 borrados
  1. 2 2
      Source/cmLocalUnixMakefileGenerator.cxx

+ 2 - 2
Source/cmLocalUnixMakefileGenerator.cxx

@@ -2356,10 +2356,10 @@ OutputBuildObjectFromSource(std::ostream& fout,
   sourceAndDeps.push_back(sourceFile);
   
   // Check for extra object-file dependencies.
+  std::vector<std::string> depends;
   const char* additionalDeps = source.GetProperty("OBJECT_DEPENDS");
   if(additionalDeps)
     {
-    std::vector<std::string> depends;
     cmSystemTools::ExpandListArgument(additionalDeps, depends);
     for(std::vector<std::string>::iterator i = depends.begin();
         i != depends.end(); ++i)
@@ -2371,7 +2371,7 @@ OutputBuildObjectFromSource(std::ostream& fout,
   this->OutputMakeRule(fout,
                        comment.c_str(),
                        objectFile.c_str(),
-                       sourceFile.c_str(),
+                       sourceAndDeps,
                        commands);
 }