diff options
author | Ken Martin <ken.martin@kitware.com> | 2002-09-06 12:33:21 (GMT) |
---|---|---|
committer | Ken Martin <ken.martin@kitware.com> | 2002-09-06 12:33:21 (GMT) |
commit | 50a1f8a5e49375c7f6025f0cf6f607aac484fdb1 (patch) | |
tree | 2e9d8f2f645a51643b7f5ba19147461f2d984500 /Source/cmLocalUnixMakefileGenerator.cxx | |
parent | 079e8469abd4a2b404fd460ff41012e8d8b6fd1d (diff) | |
download | CMake-50a1f8a5e49375c7f6025f0cf6f607aac484fdb1.zip CMake-50a1f8a5e49375c7f6025f0cf6f607aac484fdb1.tar.gz CMake-50a1f8a5e49375c7f6025f0cf6f607aac484fdb1.tar.bz2 |
minor fixes
Diffstat (limited to 'Source/cmLocalUnixMakefileGenerator.cxx')
-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); } |