[Cmake-commits] CMake branch, next, updated. v2.8.10.1-929-ga50fc6a

[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  a50fc6abc465f2bce9d90178391de48a424fee84 (commit)
       via  4d53eade8a9722719ae07bf413411ca6a3c60ab4 (commit)
      from  6f121cee77fc8fb1ad28231d7e452ae7c4242b5e (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=a50fc6abc465f2bce9d90178391de48a424fee84
commit a50fc6abc465f2bce9d90178391de48a424fee84
Merge: 6f121ce 4d53ead
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 19 14:50:04 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 19 14:50:04 2012 -0500

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


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

    VS: Fix typo generaor -> generator

diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx
index b5de51d..c218c97 100644
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@@ -16,29 +16,29 @@
 #include "cmSourceFile.h"
 #include "cmake.h"
 
-static const char vs10Win32generaorName[] = "Visual Studio 10";
-static const char vs10Win64generaorName[] = "Visual Studio 10 Win64";
-static const char vs10IA64generaorName[] = "Visual Studio 10 IA64";
+static const char vs10Win32generatorName[] = "Visual Studio 10";
+static const char vs10Win64generatorName[] = "Visual Studio 10 Win64";
+static const char vs10IA64generatorName[] = "Visual Studio 10 IA64";
 
 class cmGlobalVisualStudio10Generator::Factory
   : public cmGlobalGeneratorFactory
 {
 public:
   virtual cmGlobalGenerator* CreateGlobalGenerator(const char* name) const {
-    if(!strcmp(name, vs10Win32generaorName))
+    if(!strcmp(name, vs10Win32generatorName))
       {
       return new cmGlobalVisualStudio10Generator(
-        vs10Win32generaorName, NULL, NULL);
+        vs10Win32generatorName, NULL, NULL);
       }
-    if(!strcmp(name, vs10Win64generaorName))
+    if(!strcmp(name, vs10Win64generatorName))
       {
       return new cmGlobalVisualStudio10Generator(
-        vs10Win64generaorName, "x64", "CMAKE_FORCE_WIN64");
+        vs10Win64generatorName, "x64", "CMAKE_FORCE_WIN64");
       }
-    if(!strcmp(name, vs10IA64generaorName))
+    if(!strcmp(name, vs10IA64generatorName))
       {
       return new cmGlobalVisualStudio10Generator(
-        vs10IA64generaorName, "Itanium", "CMAKE_FORCE_IA64");
+        vs10IA64generatorName, "Itanium", "CMAKE_FORCE_IA64");
       }
     return 0;
   }
@@ -54,9 +54,9 @@ public:
   }
 
   virtual void GetGenerators(std::vector<std::string>& names) const {
-    names.push_back(vs10Win32generaorName);
-    names.push_back(vs10Win64generaorName);
-    names.push_back(vs10IA64generaorName); }
+    names.push_back(vs10Win32generatorName);
+    names.push_back(vs10Win64generatorName);
+    names.push_back(vs10IA64generatorName); }
 };
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmGlobalVisualStudio11Generator.cxx b/Source/cmGlobalVisualStudio11Generator.cxx
index 4d81e87..ba30e18 100644
--- a/Source/cmGlobalVisualStudio11Generator.cxx
+++ b/Source/cmGlobalVisualStudio11Generator.cxx
@@ -13,29 +13,29 @@
 #include "cmLocalVisualStudio10Generator.h"
 #include "cmMakefile.h"
 
-static const char vs11Win32generaorName[] = "Visual Studio 11";
-static const char vs11Win64generaorName[] = "Visual Studio 11 Win64";
-static const char vs11ARMgeneraorName[] = "Visual Studio 11 ARM";
+static const char vs11Win32generatorName[] = "Visual Studio 11";
+static const char vs11Win64generatorName[] = "Visual Studio 11 Win64";
+static const char vs11ARMgeneratorName[] = "Visual Studio 11 ARM";
 
 class cmGlobalVisualStudio11Generator::Factory
   : public cmGlobalGeneratorFactory
 {
 public:
   virtual cmGlobalGenerator* CreateGlobalGenerator(const char* name) const {
-    if(!strcmp(name, vs11Win32generaorName))
+    if(!strcmp(name, vs11Win32generatorName))
       {
       return new cmGlobalVisualStudio11Generator(
-        vs11Win32generaorName, NULL, NULL);
+        vs11Win32generatorName, NULL, NULL);
       }
-    if(!strcmp(name, vs11Win64generaorName))
+    if(!strcmp(name, vs11Win64generatorName))
       {
       return new cmGlobalVisualStudio11Generator(
-        vs11Win64generaorName, "x64", "CMAKE_FORCE_WIN64");
+        vs11Win64generatorName, "x64", "CMAKE_FORCE_WIN64");
       }
-    if(!strcmp(name, vs11ARMgeneraorName))
+    if(!strcmp(name, vs11ARMgeneratorName))
       {
       return new cmGlobalVisualStudio11Generator(
-        vs11ARMgeneraorName, "ARM", NULL);
+        vs11ARMgeneratorName, "ARM", NULL);
       }
     return 0;
   }
@@ -51,9 +51,9 @@ public:
   }
 
   virtual void GetGenerators(std::vector<std::string>& names) const {
-    names.push_back(vs11Win32generaorName);
-    names.push_back(vs11Win64generaorName);
-    names.push_back(vs11ARMgeneraorName); }
+    names.push_back(vs11Win32generatorName);
+    names.push_back(vs11Win64generatorName);
+    names.push_back(vs11ARMgeneratorName); }
 };
 
 //----------------------------------------------------------------------------

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

Summary of changes:
 Source/cmGlobalVisualStudio10Generator.cxx |   24 ++++++++++++------------
 Source/cmGlobalVisualStudio11Generator.cxx |   24 ++++++++++++------------
 2 files changed, 24 insertions(+), 24 deletions(-)


hooks/post-receive
-- 
CMake