kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'refactor-cmMakefile-constructor' 

42142d4f cmMakefile: Inline Intialize method in constructor
f39f0c0a cmMakefile: Initialize SuppressWatches member before use
This commit is contained in:
Brad King 2015-05-05 09:35:23 -04:00 committed by CMake Topic Stage
parent 01c67f524e 42142d4fd2
commit 82a55ff916
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/cmMakefile.cxx
View File

@ -178,6 +178,9 @@ cmMakefile::cmMakefile(cmLocalGenerator* localGenerator)
this->WarnUnused = false;
this->CheckSystemVars = false;
this->GeneratingBuildSystem = false;
this->SuppressWatches = false;
// Setup the default include file regular expression (match everything).
this->IncludeFileRegularExpression = "^.*$";
// Setup the default include complaint regular expression (match nothing).
@ -212,15 +215,7 @@ cmMakefile::cmMakefile(cmLocalGenerator* localGenerator)
this->LocalGenerator = localGenerator;
this->AddDefaultDefinitions();
this->Initialize();
this->GeneratingBuildSystem = false;
this->SuppressWatches = false;
}
//----------------------------------------------------------------------------
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/.+-]+@)");

1
Source/cmMakefile.h
View File

@ -919,7 +919,6 @@ protected:
private:
cmMakefile(const cmMakefile& mf);
cmMakefile& operator=(const cmMakefile& mf);
void Initialize();
cmState::Snapshot StateSnapshot;