[cmake-commits] king committed cmMakefile.cxx 1.396 1.397 cmMakefile.h 1.205 1.206

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv13967

Modified Files:
	cmMakefile.cxx cmMakefile.h 
Log Message:
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.


Index: cmMakefile.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.h,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -d -r1.205 -r1.206
--- cmMakefile.h	6 Jun 2007 20:20:02 -0000	1.205
+++ cmMakefile.h	11 Jun 2007 14:25:40 -0000	1.206
@@ -783,6 +783,7 @@
   bool IsFunctionBlocked(const cmListFileFunction& lff);
   
 private:
+  void Initialize();
 
   void ReadSources(std::ifstream& fin, bool t);
   friend class cmMakeDepend;    // make depend needs direct access

Index: cmMakefile.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.cxx,v
retrieving revision 1.396
retrieving revision 1.397
diff -u -d -r1.396 -r1.397
--- cmMakefile.cxx	8 Jun 2007 21:44:36 -0000	1.396
+++ cmMakefile.cxx	11 Jun 2007 14:25:40 -0000	1.397
@@ -85,9 +85,7 @@
   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 @@
   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()
 {