Commit 805a0a16 authored by Bill Hoffman's avatar Bill Hoffman
Browse files

ENH: merge from main tree

parent 26287087
......@@ -48,17 +48,17 @@ cmLocalGenerator *cmGlobalVisualStudio9Generator::CreateLocalGenerator()
void cmGlobalVisualStudio9Generator
::GetDocumentation(cmDocumentationEntry& entry) const
{
entry.Name = this->GetName();
entry.Brief = "Generates Visual Studio 9 2008 project files.";
entry.Full = "";
entry.name = this->GetName();
entry.brief = "Generates Visual Studio 9 2008 project files.";
entry.full = "";
}
//----------------------------------------------------------------------------
void cmGlobalVisualStudio9Generator
::EnableLanguage(std::vector<std::string>const & lang,
cmMakefile *mf, bool optional)
cmMakefile *mf)
{
cmGlobalVisualStudio8Generator::EnableLanguage(lang, mf, optional);
cmGlobalVisualStudio8Generator::EnableLanguage(lang, mf);
}
//----------------------------------------------------------------------------
......
......@@ -49,7 +49,7 @@ public:
* extension, pthreads, byte order etc.
*/
virtual void EnableLanguage(std::vector<std::string>const& languages,
cmMakefile *, bool optional);
cmMakefile *);
virtual void WriteSLNHeader(std::ostream& fout);
/**
......
......@@ -39,15 +39,15 @@ cmLocalGenerator *cmGlobalVisualStudio9Win64Generator::CreateLocalGenerator()
void cmGlobalVisualStudio9Win64Generator
::GetDocumentation(cmDocumentationEntry& entry) const
{
entry.Name = this->GetName();
entry.Brief = "Generates Visual Studio 9 2008 Win64 project files.";
entry.Full = "";
entry.name = this->GetName();
entry.brief = "Generates Visual Studio 9 2008 Win64 project files.";
entry.full = "";
}
void cmGlobalVisualStudio9Win64Generator
::EnableLanguage(std::vector<std::string>const & lang,
cmMakefile *mf, bool optional)
cmMakefile *mf)
{
mf->AddDefinition("CMAKE_FORCE_WIN64", "TRUE");
cmGlobalVisualStudio9Generator::EnableLanguage(lang, mf, optional);
cmGlobalVisualStudio9Generator::EnableLanguage(lang, mf);
}
......@@ -49,6 +49,6 @@ public:
* extension, pthreads, byte order etc.
*/
virtual void EnableLanguage(std::vector<std::string>const& languages,
cmMakefile *, bool optional);
cmMakefile *);
};
#endif
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment