kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

VS: Remove EnableLanguage from platform-specific generators 

Move the logic into the base class to remove duplicated code.
This commit is contained in:
Patrick Gansterer 2012-11-19 18:11:17 +01:00 committed by Brad King
parent 5bdf01184b
commit 8b62080c9d
5 changed files with 8 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmGlobalVisualStudio10Generator.cxx
View File

@ -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);
} }

13
Source/cmGlobalVisualStudio10IA64Generator.cxx
View File

@ -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);
}

3
Source/cmGlobalVisualStudio10IA64Generator.h
View File

@ -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

13
Source/cmGlobalVisualStudio10Win64Generator.cxx
View File

@ -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);
}

3
Source/cmGlobalVisualStudio10Win64Generator.h
View File

@ -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