summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-05-16 14:39:36 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-05-19 20:36:50 (GMT)
commit1363bff83a8e525814bbcfd1e90173d392ecc52b (patch)
treee7f0bc2d662be526956eb6046a768c655a61143a
parent5b7ff35c4d8b41e3d08305b91b0e5973f2e3906b (diff)
downloadCMake-1363bff83a8e525814bbcfd1e90173d392ecc52b.zip
CMake-1363bff83a8e525814bbcfd1e90173d392ecc52b.tar.gz
CMake-1363bff83a8e525814bbcfd1e90173d392ecc52b.tar.bz2
cmMakefile: Remove duplicate variable initialization.
-rw-r--r--Source/cmMakefile.cxx6
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 1a192f5..a95f4b8 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -152,8 +152,8 @@ cmMakefile::cmMakefile(cmLocalGenerator* localGenerator)
this->Internal->IsSourceFileTryCompile = false;
// Initialize these first since AddDefaultDefinitions calls AddDefinition
- this->WarnUnused = false;
- this->CheckSystemVars = false;
+ this->WarnUnused = this->GetCMakeInstance()->GetWarnUnused();
+ this->CheckSystemVars = this->GetCMakeInstance()->GetCheckSystemVars();
this->GeneratingBuildSystem = false;
this->SuppressWatches = false;
@@ -223,8 +223,6 @@ cmMakefile::cmMakefile(cmLocalGenerator* localGenerator)
#endif
this->Properties.SetCMakeInstance(this->GetCMakeInstance());
- this->WarnUnused = this->GetCMakeInstance()->GetWarnUnused();
- this->CheckSystemVars = this->GetCMakeInstance()->GetCheckSystemVars();
{
const char* dir = this->GetCMakeInstance()->GetHomeDirectory();