From bde0dab15d6bdefeadd329a67dbe53812d9f3254 Mon Sep 17 00:00:00 2001
From: Stephen Kelly <steveire@gmail.com>
Date: Wed, 22 Jan 2014 16:33:56 +0100
Subject: [PATCH] cmMakefile: Make ConfigureString const.

---
 Source/cmMakefile.cxx | 2 +-
 Source/cmMakefile.h   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index fa8918ee4..55a9d5cd2 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -3371,7 +3371,7 @@ std::string cmMakefile::GetModulesFile(const char* filename) const
 
 void cmMakefile::ConfigureString(const std::string& input,
                                  std::string& output, bool atOnly,
-                                 bool escapeQuotes)
+                                 bool escapeQuotes) const
 {
   // Split input to handle one line at a time.
   std::string::const_iterator lineStart = input.begin();
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index dac3dfb1f..66a33bb46 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -692,7 +692,7 @@ public:
    * See cmConfigureFileCommand for details.
    */
   void ConfigureString(const std::string& input, std::string& output,
-                       bool atOnly, bool escapeQuotes);
+                       bool atOnly, bool escapeQuotes) const;
 
   /**
    * Copy file but change lines acording to ConfigureString
@@ -968,8 +968,8 @@ private:
 
   std::map<cmStdString, bool> SubDirectoryOrder;
 
-  cmsys::RegularExpression cmDefineRegex;
-  cmsys::RegularExpression cmDefine01Regex;
+  mutable cmsys::RegularExpression cmDefineRegex;
+  mutable cmsys::RegularExpression cmDefine01Regex;
   mutable cmsys::RegularExpression cmAtVarRegex;
 
   cmPropertyMap Properties;