diff options
| author | Brad King <brad.king@kitware.com> | 2002-12-13 22:34:34 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2002-12-13 22:34:34 (GMT) |
| commit | 4cbcd08594697a77aa7d619169706e62e01a07e2 (patch) | |
| tree | 66920632f08c4080ee1546807670667197a29f16 | |
| parent | 3348131819bb30a592898631df11aaf8ad8db4d2 (diff) | |
| download | CMake-4cbcd08594697a77aa7d619169706e62e01a07e2.zip CMake-4cbcd08594697a77aa7d619169706e62e01a07e2.tar.gz CMake-4cbcd08594697a77aa7d619169706e62e01a07e2.tar.bz2 | |
BUG: Need source file and OBJECT_DEPENDS as dependencies of an object file.
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator.cxx b/Source/cmLocalUnixMakefileGenerator.cxx index cd7d67e..bb809ea 100644 --- a/Source/cmLocalUnixMakefileGenerator.cxx +++ b/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); } |