ENH: change expand stuff to pass a struct for all the args

1 files changed, 9 insertions, 11 deletions

diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx
index c953b72..5399151 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -294,21 +294,19 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
   cleanObjs += variableName;
   cleanObjs += ")";
 
+  cmLocalGenerator::RuleVariables vars;
+  vars.Language = linkLanguage;
+  vars.Objects = buildObjs.c_str();
+  vars.Target = targetOutPathReal.c_str();
+  std::string linkString = linklibs.str();
+  vars.LinkLibraries = linkString.c_str();
+  vars.Flags = flags.c_str();
+  vars.LinkFlags = linkFlags.c_str();
   // Expand placeholders in the commands.
   for(std::vector<std::string>::iterator i = commands.begin();
       i != commands.end(); ++i)
     {
-    this->LocalGenerator->ExpandRuleVariables(*i,
-                                              linkLanguage,
-                                              buildObjs.c_str(),
-                                              targetOutPathReal.c_str(),
-                                              linklibs.str().c_str(),
-                                              0,
-                                              0,
-                                              flags.c_str(),
-                                              0,
-                                              0,
-                                              linkFlags.c_str());
+    this->LocalGenerator->ExpandRuleVariables(*i, vars);
     }
 
   // Write the build rule.