summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
Diffstat (limited to 'Source')
-rw-r--r--Source/cmMakefile.cxx11
-rw-r--r--Source/cmMakefile.h1
2 files changed, 3 insertions, 9 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 7b3ca53..de1cf07 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -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/.+-]+@)");
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index ad098ef..99f2544 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -919,7 +919,6 @@ protected:
private:
cmMakefile(const cmMakefile& mf);
cmMakefile& operator=(const cmMakefile& mf);
- void Initialize();
cmState::Snapshot StateSnapshot;