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.
This commit is contained in:
parent
4ed167090e
commit
28e94533dd
@ -85,9 +85,7 @@ cmMakefile::cmMakefile()
|
|||||||
this->AddSourceGroup("Resources", "\\.plist$");
|
this->AddSourceGroup("Resources", "\\.plist$");
|
||||||
#endif
|
#endif
|
||||||
this->AddDefaultDefinitions();
|
this->AddDefaultDefinitions();
|
||||||
this->cmDefineRegex.compile("#cmakedefine[ \t]+([A-Za-z_0-9]*)");
|
this->Initialize();
|
||||||
this->cmDefine01Regex.compile("#cmakedefine01[ \t]+([A-Za-z_0-9]*)");
|
|
||||||
this->cmAtVarRegex.compile("(@[A-Za-z_0-9/.+-]+@)");
|
|
||||||
this->PreOrder = false;
|
this->PreOrder = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -131,11 +129,16 @@ cmMakefile::cmMakefile(const cmMakefile& mf)
|
|||||||
this->Properties = mf.Properties;
|
this->Properties = mf.Properties;
|
||||||
this->PreOrder = mf.PreOrder;
|
this->PreOrder = mf.PreOrder;
|
||||||
this->ListFileStack = mf.ListFileStack;
|
this->ListFileStack = mf.ListFileStack;
|
||||||
this->cmDefineRegex = mf.cmDefineRegex;
|
this->Initialize();
|
||||||
this->cmDefine01Regex = mf.cmDefine01Regex;
|
|
||||||
this->cmAtVarRegex = mf.cmAtVarRegex;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//----------------------------------------------------------------------------
|
||||||
|
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()
|
unsigned int cmMakefile::GetCacheMajorVersion()
|
||||||
{
|
{
|
||||||
|
@ -783,6 +783,7 @@ protected:
|
|||||||
bool IsFunctionBlocked(const cmListFileFunction& lff);
|
bool IsFunctionBlocked(const cmListFileFunction& lff);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
void Initialize();
|
||||||
|
|
||||||
void ReadSources(std::ifstream& fin, bool t);
|
void ReadSources(std::ifstream& fin, bool t);
|
||||||
friend class cmMakeDepend; // make depend needs direct access
|
friend class cmMakeDepend; // make depend needs direct access
|
||||||
|
Loading…
x
Reference in New Issue
Block a user