ENH: Refactor custom command rule hashing

This simplifies computation of custom command rule hashes to hash
content exactly chosen as the custom commands are generated.
Unfortunately this will change the hashes of existing build trees from
earlier CMake versions, but this is not a big deal.  The change is
necessary so that in the future we can make optional adjustments to
custom command lines at generate time without changing the hashes every
time the option is changed.

1 files changed, 5 insertions, 6 deletions

diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index e19cd1d..c2cad66 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -1119,11 +1119,12 @@ void cmMakefileTargetGenerator
       ->AppendEcho(commands, comment.c_str(),
                    cmLocalUnixMakefileGenerator3::EchoGenerate);
     }
-  // Below we need to skip over the echo and progress commands.
-  unsigned int skip = static_cast<unsigned int>(commands.size());
 
   // Now append the actual user-specified commands.
-  this->LocalGenerator->AppendCustomCommand(commands, cc);
+  cmOStringStream content;
+  this->LocalGenerator->AppendCustomCommand(commands, cc, false,
+                                            cmLocalGenerator::HOME_OUTPUT,
+                                            &content);
 
   // Collect the dependencies.
   std::vector<std::string> depends;
@@ -1151,9 +1152,7 @@ void cmMakefileTargetGenerator
   // If the rule has changed make sure the output is rebuilt.
   if(!symbolic)
     {
-    this->GlobalGenerator->AddRuleHash(cc.GetOutputs(),
-                                       commands.begin()+skip,
-                                       commands.end());
+    this->GlobalGenerator->AddRuleHash(cc.GetOutputs(), content.str());
     }
   }