[Cmake-commits] CMake branch, next, updated. v3.2.2-3116-g60c594f

[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  60c594fd39a132157b86f1837600caa61b7ad907 (commit)
       via  4ea4b249dd75bc7198535cc1b89d87fa449c5f10 (commit)
      from  8c1580c8b30efdc84f8252d5a8b233420ca362ba (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=60c594fd39a132157b86f1837600caa61b7ad907
commit 60c594fd39a132157b86f1837600caa61b7ad907
Merge: 8c1580c 4ea4b24
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun May 24 08:17:18 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun May 24 08:17:18 2015 -0400

    Merge topic 'inject-state-snapshot' into next
    
    4ea4b249 fixup! cmGlobalGenerator: Require a cmake instance in ctor.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4ea4b249dd75bc7198535cc1b89d87fa449c5f10
commit 4ea4b249dd75bc7198535cc1b89d87fa449c5f10
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun May 24 14:16:54 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun May 24 14:16:54 2015 +0200

    fixup! cmGlobalGenerator: Require a cmake instance in ctor.

diff --git a/Source/cmGlobalVisualStudio11Generator.cxx b/Source/cmGlobalVisualStudio11Generator.cxx
index 2c00e90..419bf8a 100644
--- a/Source/cmGlobalVisualStudio11Generator.cxx
+++ b/Source/cmGlobalVisualStudio11Generator.cxx
@@ -105,9 +105,9 @@ cmGlobalGeneratorFactory* cmGlobalVisualStudio11Generator::NewFactory()
 }
 
 //----------------------------------------------------------------------------
-cmGlobalVisualStudio11Generator::cmGlobalVisualStudio11Generator(
+cmGlobalVisualStudio11Generator::cmGlobalVisualStudio11Generator(cmake* cm,
   const std::string& name, const std::string& platformName)
-  : cmGlobalVisualStudio10Generator(name, platformName)
+  : cmGlobalVisualStudio10Generator(cm, name, platformName)
 {
   std::string vc11Express;
   this->ExpressEdition = cmSystemTools::ReadRegistryValue(
diff --git a/Source/cmGlobalVisualStudio12Generator.cxx b/Source/cmGlobalVisualStudio12Generator.cxx
index 164452b..efa1133 100644
--- a/Source/cmGlobalVisualStudio12Generator.cxx
+++ b/Source/cmGlobalVisualStudio12Generator.cxx
@@ -85,9 +85,9 @@ cmGlobalGeneratorFactory* cmGlobalVisualStudio12Generator::NewFactory()
 }
 
 //----------------------------------------------------------------------------
-cmGlobalVisualStudio12Generator::cmGlobalVisualStudio12Generator(
+cmGlobalVisualStudio12Generator::cmGlobalVisualStudio12Generator(cmake* cm,
   const std::string& name, const std::string& platformName)
-  : cmGlobalVisualStudio11Generator(name, platformName)
+  : cmGlobalVisualStudio11Generator(cm, name, platformName)
 {
   std::string vc12Express;
   this->ExpressEdition = cmSystemTools::ReadRegistryValue(
diff --git a/Source/cmGlobalVisualStudio14Generator.cxx b/Source/cmGlobalVisualStudio14Generator.cxx
index 15f7907..2cf55d4 100644
--- a/Source/cmGlobalVisualStudio14Generator.cxx
+++ b/Source/cmGlobalVisualStudio14Generator.cxx
@@ -85,9 +85,9 @@ cmGlobalGeneratorFactory* cmGlobalVisualStudio14Generator::NewFactory()
 }
 
 //----------------------------------------------------------------------------
-cmGlobalVisualStudio14Generator::cmGlobalVisualStudio14Generator(
+cmGlobalVisualStudio14Generator::cmGlobalVisualStudio14Generator(cmake* cm,
   const std::string& name, const std::string& platformName)
-  : cmGlobalVisualStudio12Generator(name, platformName)
+  : cmGlobalVisualStudio12Generator(cm, name, platformName)
 {
   std::string vc14Express;
   this->ExpressEdition = cmSystemTools::ReadRegistryValue(
diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx
index a408adf..1ab4c9c 100644
--- a/Source/cmGlobalVisualStudio71Generator.cxx
+++ b/Source/cmGlobalVisualStudio71Generator.cxx
@@ -16,7 +16,7 @@
 #include "cmake.h"
 
 //----------------------------------------------------------------------------
-cmGlobalVisualStudio71Generator::cmGlobalVisualStudio71Generator(cmake* cm
+cmGlobalVisualStudio71Generator::cmGlobalVisualStudio71Generator(cmake* cm,
   const std::string& platformName)
   : cmGlobalVisualStudio7Generator(cm, platformName)
 {
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 4f26acc..4dd54d0 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -44,7 +44,7 @@ static cmVS7FlagTable cmVS7ExtraFlagTable[] =
   {0,0,0,0,0}
 };
 
-cmGlobalVisualStudio7Generator::cmGlobalVisualStudio7Generator(cmake *cm
+cmGlobalVisualStudio7Generator::cmGlobalVisualStudio7Generator(cmake *cm,
   const std::string& platformName)
   : cmGlobalVisualStudioGenerator(cm)
 {

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

Summary of changes:
 Source/cmGlobalVisualStudio11Generator.cxx |    4 ++--
 Source/cmGlobalVisualStudio12Generator.cxx |    4 ++--
 Source/cmGlobalVisualStudio14Generator.cxx |    4 ++--
 Source/cmGlobalVisualStudio71Generator.cxx |    2 +-
 Source/cmGlobalVisualStudio7Generator.cxx  |    2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake