[Cmake-commits] CMake branch, next, updated. v2.8.10.1-933-g28d7130

[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  28d71304a1ab6965728e7a1c126ab012143c7bdb (commit)
       via  4eeab94cfe3880678c20ea0b9db35b99590ec771 (commit)
      from  87a5fea640532cf82c640374fb99ba755472b9d1 (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=28d71304a1ab6965728e7a1c126ab012143c7bdb
commit 28d71304a1ab6965728e7a1c126ab012143c7bdb
Merge: 87a5fea 4eeab94
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 19 14:56:14 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 19 14:56:14 2012 -0500

    Merge topic 'generator-factory' into next
    
    4eeab94 VS: Fix typo generaor -> generator


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4eeab94cfe3880678c20ea0b9db35b99590ec771
commit 4eeab94cfe3880678c20ea0b9db35b99590ec771
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 19 14:55:34 2012 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 19 14:55:34 2012 -0500

    VS: Fix typo generaor -> generator

diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index 05f7fb7..7aad9b2 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -16,23 +16,23 @@
 #include "cmake.h"
 #include "cmGeneratedFileStream.h"
 
-static const char vs8Win32generaorName[] = "Visual Studio 8 2005";
-static const char vs8Win64generaorName[] = "Visual Studio 8 2005 Win64";
+static const char vs8Win32generatorName[] = "Visual Studio 8 2005";
+static const char vs8Win64generatorName[] = "Visual Studio 8 2005 Win64";
 
 class cmGlobalVisualStudio8Generator::Factory
   : public cmGlobalGeneratorFactory
 {
 public:
   virtual cmGlobalGenerator* CreateGlobalGenerator(const char* name) const {
-    if(!strcmp(name, vs8Win32generaorName))
+    if(!strcmp(name, vs8Win32generatorName))
       {
       return new cmGlobalVisualStudio8Generator(
-        vs8Win32generaorName, NULL, NULL);
+        vs8Win32generatorName, NULL, NULL);
       }
-    if(!strcmp(name, vs8Win64generaorName))
+    if(!strcmp(name, vs8Win64generatorName))
       {
       return new cmGlobalVisualStudio8Generator(
-        vs8Win64generaorName, "x64", "CMAKE_FORCE_WIN64");
+        vs8Win64generatorName, "x64", "CMAKE_FORCE_WIN64");
       }
     return 0;
   }
@@ -48,8 +48,8 @@ public:
   }
 
   virtual void GetGenerators(std::vector<std::string>& names) const {
-    names.push_back(vs8Win32generaorName);
-    names.push_back(vs8Win64generaorName); }
+    names.push_back(vs8Win32generatorName);
+    names.push_back(vs8Win64generatorName); }
 };
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmGlobalVisualStudio9Generator.cxx b/Source/cmGlobalVisualStudio9Generator.cxx
index cf7b57a..87599ef 100644
--- a/Source/cmGlobalVisualStudio9Generator.cxx
+++ b/Source/cmGlobalVisualStudio9Generator.cxx
@@ -15,29 +15,29 @@
 #include "cmMakefile.h"
 #include "cmake.h"
 
-static const char vs9Win32generaorName[] = "Visual Studio 9 2008";
-static const char vs9Win64generaorName[] = "Visual Studio 8 2005 Win64";
-static const char vs9IA64generaorName[] = "Visual Studio 9 2008 IA64";
+static const char vs9Win32generatorName[] = "Visual Studio 9 2008";
+static const char vs9Win64generatorName[] = "Visual Studio 8 2005 Win64";
+static const char vs9IA64generatorName[] = "Visual Studio 9 2008 IA64";
 
 class cmGlobalVisualStudio9Generator::Factory
   : public cmGlobalGeneratorFactory
 {
 public:
   virtual cmGlobalGenerator* CreateGlobalGenerator(const char* name) const {
-    if(!strcmp(name, vs9Win32generaorName))
+    if(!strcmp(name, vs9Win32generatorName))
       {
       return new cmGlobalVisualStudio9Generator(
-        vs9Win32generaorName, NULL, NULL);
+        vs9Win32generatorName, NULL, NULL);
       }
-    if(!strcmp(name, vs9Win64generaorName))
+    if(!strcmp(name, vs9Win64generatorName))
       {
       return new cmGlobalVisualStudio9Generator(
-        vs9Win64generaorName, "x64", "CMAKE_FORCE_WIN64");
+        vs9Win64generatorName, "x64", "CMAKE_FORCE_WIN64");
       }
-    if(!strcmp(name, vs9IA64generaorName))
+    if(!strcmp(name, vs9IA64generatorName))
       {
       return new cmGlobalVisualStudio9Generator(
-        vs9IA64generaorName, "Itanium", "CMAKE_FORCE_IA64");
+        vs9IA64generatorName, "Itanium", "CMAKE_FORCE_IA64");
       }
     return 0;
   }
@@ -53,9 +53,9 @@ public:
   }
 
   virtual void GetGenerators(std::vector<std::string>& names) const {
-    names.push_back(vs9Win32generaorName);
-    names.push_back(vs9Win64generaorName);
-    names.push_back(vs9IA64generaorName); }
+    names.push_back(vs9Win32generatorName);
+    names.push_back(vs9Win64generatorName);
+    names.push_back(vs9IA64generatorName); }
 };
 
 //----------------------------------------------------------------------------

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

Summary of changes:
 Source/cmGlobalVisualStudio8Generator.cxx |   16 ++++++++--------
 Source/cmGlobalVisualStudio9Generator.cxx |   24 ++++++++++++------------
 2 files changed, 20 insertions(+), 20 deletions(-)


hooks/post-receive
-- 
CMake