From 619a92eacd689d867343c05fff568bf1dc9467b7 Mon Sep 17 00:00:00 2001
From: Sebastian Holtermann <sebholt@xwmw.org>
Date: Mon, 26 Aug 2019 17:25:44 +0200
Subject: Autogen: cmQtAutoRcc settings hash computation optimizations

---
 Source/cmQtAutoRcc.cxx | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/Source/cmQtAutoRcc.cxx b/Source/cmQtAutoRcc.cxx
index 1cceaf1..e931346 100644
--- a/Source/cmQtAutoRcc.cxx
+++ b/Source/cmQtAutoRcc.cxx
@@ -13,6 +13,8 @@
 #include "cmSystemTools.h"
 #include "cm_string_view.hxx"
 
+#include <algorithm>
+
 cmQtAutoRcc::cmQtAutoRcc() = default;
 
 cmQtAutoRcc::~cmQtAutoRcc() = default;
@@ -164,15 +166,19 @@ bool cmQtAutoRcc::SettingsFileRead()
 {
   // Compose current settings strings
   {
-    cmCryptoHash crypt(cmCryptoHash::AlgoSHA256);
-    std::string const sep(" ~~~ ");
-    {
-      std::string str =
-        cmStrCat(RccExecutable_, sep, cmJoin(RccListOptions_, ";"), sep,
-                 QrcFile_, sep, RccPathChecksum_, sep, RccFileName_, sep,
-                 cmJoin(Options_, ";"), sep, cmJoin(Inputs_, ";"), sep);
-      SettingsString_ = crypt.HashString(str);
-    }
+    cmCryptoHash cryptoHash(cmCryptoHash::AlgoSHA256);
+    auto cha = [&cryptoHash](cm::string_view value) {
+      cryptoHash.Append(value);
+      cryptoHash.Append(";");
+    };
+    cha(RccExecutable_);
+    std::for_each(RccListOptions_.begin(), RccListOptions_.end(), cha);
+    cha(QrcFile_);
+    cha(RccPathChecksum_);
+    cha(RccFileName_);
+    std::for_each(Options_.begin(), Options_.end(), cha);
+    std::for_each(Inputs_.begin(), Inputs_.end(), cha);
+    SettingsString_ = cryptoHash.FinalizeHex();
   }
 
   // Make sure the settings file exists
-- 
cgit v0.12