From f39f0c0aec3ecae02a89d47be6bbb85632ca57f3 Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 4 May 2015 10:16:34 -0400 Subject: [PATCH] cmMakefile: Initialize SuppressWatches member before use In commit 86f3cd0f (cmMakefile: Require the localGenerator in the constructor, 2015-04-27) we added use of GetDefinition to the Initialize method. Set SuppressWatches before calling this method since GetDefinition checks it. --- Source/cmMakefile.cxx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 0935383e9..1f406d365 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -83,6 +83,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). @@ -117,10 +120,8 @@ cmMakefile::cmMakefile(cmLocalGenerator* localGenerator) this->LocalGenerator = localGenerator; this->AddDefaultDefinitions(); - this->Initialize(); - this->GeneratingBuildSystem = false; - this->SuppressWatches = false; + this->Initialize(); } //----------------------------------------------------------------------------