summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-05-04 14:16:34 (GMT)
committerBrad King <brad.king@kitware.com>2015-05-04 14:22:01 (GMT)
commitf39f0c0aec3ecae02a89d47be6bbb85632ca57f3 (patch)
tree9d20359680c0f2236f690a139970ca37f8202b52 /Source
parent46f6a5f458d7d9ef074820d3e90960af2793bd33 (diff)
downloadCMake-f39f0c0aec3ecae02a89d47be6bbb85632ca57f3.zip
CMake-f39f0c0aec3ecae02a89d47be6bbb85632ca57f3.tar.gz
CMake-f39f0c0aec3ecae02a89d47be6bbb85632ca57f3.tar.bz2
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.
Diffstat (limited to 'Source')
-rw-r--r--Source/cmMakefile.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 0935383..1f406d3 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();
}
//----------------------------------------------------------------------------