diff options
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator.cxx b/Source/cmLocalUnixMakefileGenerator.cxx index 7454600..3a22cf9 100644 --- a/Source/cmLocalUnixMakefileGenerator.cxx +++ b/Source/cmLocalUnixMakefileGenerator.cxx @@ -799,23 +799,23 @@ void cmLocalUnixMakefileGenerator::OutputUtilityRule(std::ostream& fout, std::string comment = "Rule to build Utility "; comment += name; std::string depends; + std::string replaceVars; const std::vector<cmCustomCommand> &ccs = t.GetCustomCommands(); for(std::vector<cmCustomCommand>::const_iterator i = ccs.begin(); i != ccs.end(); ++i) { - const std::vector<std::string> & dep = i->GetDepends(); - for(std::vector<std::string>::const_iterator d = dep.begin(); - d != dep.end(); ++d) - { - depends += " \\\n"; - depends += *d; - } + const std::vector<std::string> & dep = i->GetDepends(); + for(std::vector<std::string>::const_iterator d = dep.begin(); + d != dep.end(); ++d) + { + depends += " \\\n"; + replaceVars = *d; + m_Makefile->ExpandVariablesInString(replaceVars); + depends += this->ConvertToOutputPath(replaceVars.c_str()); + } } - this->OutputMakeRule(fout, - comment.c_str(), - name, - depends.c_str(), - cc); + this->OutputMakeRule(fout, comment.c_str(), name, + depends.c_str(), cc); } |