[Cmake-commits] CMake branch, next, updated. v3.2.2-2980-g77cc6b6

[Stephen Kelly]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  77cc6b6b8aa78b7e5ad2df9b22e8cbf638dcd826 (commit)
       via  3b9c6ba178b265e2598ea7c740dcb732f47735e8 (commit)
      from  b5a2ad0f4858268af2e35baf3a10e830aebb80c0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=77cc6b6b8aa78b7e5ad2df9b22e8cbf638dcd826
commit 77cc6b6b8aa78b7e5ad2df9b22e8cbf638dcd826
Merge: b5a2ad0 3b9c6ba
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue May 19 16:36:40 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 19 16:36:40 2015 -0400

    Merge topic 'clean-up-cmMakefile' into next
    
    3b9c6ba1 fixup! cmMakefile: Remove duplicate variable initialization.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3b9c6ba178b265e2598ea7c740dcb732f47735e8
commit 3b9c6ba178b265e2598ea7c740dcb732f47735e8
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue May 19 22:36:13 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue May 19 22:36:13 2015 +0200

    fixup! cmMakefile: Remove duplicate variable initialization.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 1267418..dc47a93 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -142,6 +142,10 @@ cmMakefile::cmMakefile(cmLocalGenerator* localGenerator)
   this->Internal->PushDefinitions();
   this->Internal->IsSourceFileTryCompile = false;
 
+  // Initialize these first since AddDefaultDefinitions calls AddDefinition
+  this->WarnUnused = this->GetCMakeInstance()->GetWarnUnused();
+  this->CheckSystemVars = this->GetCMakeInstance()->GetCheckSystemVars();
+
   this->GeneratingBuildSystem = false;
   this->SuppressWatches = false;
 
@@ -210,8 +214,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();

-----------------------------------------------------------------------

Summary of changes:
 Source/cmMakefile.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake