BUG: More problems with cmMakefile copy-constructor. It seems the regular expression class cannot be assigned but does not enforce this limitation at compile time.

2 files changed, 10 insertions, 6 deletions

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 7b89fd9..d0aced8 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -85,9 +85,7 @@ cmMakefile::cmMakefile()
   this->AddSourceGroup("Resources", "\\.plist$");
 #endif
   this->AddDefaultDefinitions();
-  this->cmDefineRegex.compile("#cmakedefine[ \t]+([A-Za-z_0-9]*)");
-  this->cmDefine01Regex.compile("#cmakedefine01[ \t]+([A-Za-z_0-9]*)");
-  this->cmAtVarRegex.compile("(@[A-Za-z_0-9/.+-]+@)");
+  this->Initialize();
   this->PreOrder = false;
 }
 
@@ -131,11 +129,16 @@ cmMakefile::cmMakefile(const cmMakefile& mf)
   this->Properties = mf.Properties;
   this->PreOrder = mf.PreOrder;
   this->ListFileStack = mf.ListFileStack;
-  this->cmDefineRegex = mf.cmDefineRegex;
-  this->cmDefine01Regex = mf.cmDefine01Regex;
-  this->cmAtVarRegex = mf.cmAtVarRegex;
+  this->Initialize();
 }
 
+//----------------------------------------------------------------------------
+void cmMakefile::Initialize()
+{
+  this->cmDefineRegex.compile("#cmakedefine[ \t]+([A-Za-z_0-9]*)");
+  this->cmDefine01Regex.compile("#cmakedefine01[ \t]+([A-Za-z_0-9]*)");
+  this->cmAtVarRegex.compile("(@[A-Za-z_0-9/.+-]+@)");
+}
 
 unsigned int cmMakefile::GetCacheMajorVersion()
 {
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 93b8f02..dfd3ff8 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -783,6 +783,7 @@ protected:
   bool IsFunctionBlocked(const cmListFileFunction& lff);
   
 private:
+  void Initialize();
 
   void ReadSources(std::ifstream& fin, bool t);
   friend class cmMakeDepend;    // make depend needs direct access