Prechádzať zdrojové kódy

cmMakefile: Remove duplicate variable initialization.

Stephen Kelly 10 rokov pred
rodič
commit
1363bff83a
1 zmenil súbory, kde vykonal 2 pridanie a 4 odobranie
  1. 2 4
      Source/cmMakefile.cxx

+ 2 - 4
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();