BUG: Need source file and OBJECT_DEPENDS as dependencies of an object file.
This commit is contained in:
parent
3348131819
commit
4cbcd08594
@ -2356,10 +2356,10 @@ OutputBuildObjectFromSource(std::ostream& fout,
|
|||||||
sourceAndDeps.push_back(sourceFile);
|
sourceAndDeps.push_back(sourceFile);
|
||||||
|
|
||||||
// Check for extra object-file dependencies.
|
// Check for extra object-file dependencies.
|
||||||
|
std::vector<std::string> depends;
|
||||||
const char* additionalDeps = source.GetProperty("OBJECT_DEPENDS");
|
const char* additionalDeps = source.GetProperty("OBJECT_DEPENDS");
|
||||||
if(additionalDeps)
|
if(additionalDeps)
|
||||||
{
|
{
|
||||||
std::vector<std::string> depends;
|
|
||||||
cmSystemTools::ExpandListArgument(additionalDeps, depends);
|
cmSystemTools::ExpandListArgument(additionalDeps, depends);
|
||||||
for(std::vector<std::string>::iterator i = depends.begin();
|
for(std::vector<std::string>::iterator i = depends.begin();
|
||||||
i != depends.end(); ++i)
|
i != depends.end(); ++i)
|
||||||
@ -2371,7 +2371,7 @@ OutputBuildObjectFromSource(std::ostream& fout,
|
|||||||
this->OutputMakeRule(fout,
|
this->OutputMakeRule(fout,
|
||||||
comment.c_str(),
|
comment.c_str(),
|
||||||
objectFile.c_str(),
|
objectFile.c_str(),
|
||||||
sourceFile.c_str(),
|
sourceAndDeps,
|
||||||
commands);
|
commands);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user