Browse Source

VS: Remove EnableLanguage from platform-specific generators

Move the logic into the base class to remove duplicated code.
Patrick Gansterer 13 years ago
parent
commit
8b62080c9d

+ 8 - 0
Source/cmGlobalVisualStudio10Generator.cxx

@@ -100,6 +100,14 @@ void cmGlobalVisualStudio10Generator
 ::EnableLanguage(std::vector<std::string>const &  lang,
 ::EnableLanguage(std::vector<std::string>const &  lang,
                  cmMakefile *mf, bool optional)
                  cmMakefile *mf, bool optional)
 {
 {
+  if(!strcmp(this->ArchitectureId, "Itanium") ||
+     !strcmp(this->ArchitectureId, "x64"))
+    {
+    if(this->IsExpressEdition() && !this->Find64BitTools(mf))
+      {
+      return;
+      }
+    }
   cmGlobalVisualStudio8Generator::EnableLanguage(lang, mf, optional);
   cmGlobalVisualStudio8Generator::EnableLanguage(lang, mf, optional);
 }
 }
 
 

+ 0 - 13
Source/cmGlobalVisualStudio10IA64Generator.cxx

@@ -28,16 +28,3 @@ void cmGlobalVisualStudio10IA64Generator
   entry.Brief = "Generates Visual Studio 10 Itanium project files.";
   entry.Brief = "Generates Visual Studio 10 Itanium project files.";
   entry.Full = "";
   entry.Full = "";
 }
 }
-
-//----------------------------------------------------------------------------
-void cmGlobalVisualStudio10IA64Generator
-::EnableLanguage(std::vector<std::string> const& languages,
-                 cmMakefile* mf, bool optional)
-{
-  if(this->IsExpressEdition() && !this->Find64BitTools(mf))
-    {
-    return;
-    }
-  this->cmGlobalVisualStudio10Generator
-    ::EnableLanguage(languages, mf, optional);
-}

+ 0 - 3
Source/cmGlobalVisualStudio10IA64Generator.h

@@ -30,8 +30,5 @@ public:
 
 
   /** Get the documentation entry for this generator.  */
   /** Get the documentation entry for this generator.  */
   static void GetDocumentation(cmDocumentationEntry& entry);
   static void GetDocumentation(cmDocumentationEntry& entry);
-
-  virtual void EnableLanguage(std::vector<std::string>const& languages,
-                              cmMakefile *, bool optional);
 };
 };
 #endif
 #endif

+ 0 - 13
Source/cmGlobalVisualStudio10Win64Generator.cxx

@@ -28,16 +28,3 @@ void cmGlobalVisualStudio10Win64Generator
   entry.Brief = "Generates Visual Studio 10 Win64 project files.";
   entry.Brief = "Generates Visual Studio 10 Win64 project files.";
   entry.Full = "";
   entry.Full = "";
 }
 }
-
-//----------------------------------------------------------------------------
-void cmGlobalVisualStudio10Win64Generator
-::EnableLanguage(std::vector<std::string> const& languages,
-                 cmMakefile* mf, bool optional)
-{
-  if(this->IsExpressEdition() && !this->Find64BitTools(mf))
-    {
-    return;
-    }
-  this->cmGlobalVisualStudio10Generator
-    ::EnableLanguage(languages, mf, optional);
-}

+ 0 - 3
Source/cmGlobalVisualStudio10Win64Generator.h

@@ -30,8 +30,5 @@ public:
 
 
   /** Get the documentation entry for this generator.  */
   /** Get the documentation entry for this generator.  */
   static void GetDocumentation(cmDocumentationEntry& entry);
   static void GetDocumentation(cmDocumentationEntry& entry);
-
-  virtual void EnableLanguage(std::vector<std::string>const& languages,
-                              cmMakefile *, bool optional);
 };
 };
 #endif
 #endif