[Cmake-commits] CMake branch, next, updated. v3.2.2-2462-ge514024

[Brad King]

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  e51402472cb8f61aea30abb4adbf121c273057da (commit)
       via  42142d4fd2455f3c792283ba9c261c3756a10d8a (commit)
       via  f39f0c0aec3ecae02a89d47be6bbb85632ca57f3 (commit)
      from  ebcfc6f5e941872f18addf2d7d8f8e9f825a8f15 (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=e51402472cb8f61aea30abb4adbf121c273057da
commit e51402472cb8f61aea30abb4adbf121c273057da
Merge: ebcfc6f 42142d4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon May 4 10:37:00 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon May 4 10:37:00 2015 -0400

    Merge topic 'refactor-cmMakefile-constructor' into next
    
    42142d4f cmMakefile: Inline Intialize method in constructor
    f39f0c0a cmMakefile: Initialize SuppressWatches member before use


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=42142d4fd2455f3c792283ba9c261c3756a10d8a
commit 42142d4fd2455f3c792283ba9c261c3756a10d8a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon May 4 10:18:50 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon May 4 10:22:01 2015 -0400

    cmMakefile: Inline Intialize method in constructor
    
    Since commit 80909041 (cmMakefile: Disable copy constructor, 2015-04-18)
    the only call to cmMakefile::Initialize is in one constructor.  Inline
    it and drop the separate method.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 1f406d3..d7bb5d9 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -121,12 +121,6 @@ cmMakefile::cmMakefile(cmLocalGenerator* localGenerator)
 
   this->AddDefaultDefinitions();
 
-  this->Initialize();
-}
-
-//----------------------------------------------------------------------------
-void cmMakefile::Initialize()
-{
   this->cmDefineRegex.compile("#cmakedefine[ \t]+([A-Za-z_0-9]*)");
   this->cmDefine01Regex.compile("#cmakedefine01[ \t]+([A-Za-z_0-9]*)");
   this->cmAtVarRegex.compile("(@[A-Za-z_0-9/.+-]+@)");
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 8968e81..f18f114 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -918,7 +918,6 @@ protected:
 private:
   cmMakefile(const cmMakefile& mf);
   cmMakefile& operator=(const cmMakefile& mf);
-  void Initialize();
 
   cmState::Snapshot StateSnapshot;
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f39f0c0aec3ecae02a89d47be6bbb85632ca57f3
commit f39f0c0aec3ecae02a89d47be6bbb85632ca57f3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon May 4 10:16:34 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon May 4 10:22:01 2015 -0400

    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.

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();
 }
 
 //----------------------------------------------------------------------------

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

Summary of changes:
 Source/cmMakefile.cxx |   11 +++--------
 Source/cmMakefile.h   |    1 -
 2 files changed, 3 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
CMake