Merge topic 'vs-simplify-CreateLocalGenerator'
f34321a
VS: Remove duplicated implementations of CreateLocalGenerator()
This commit is contained in:
commit
2183743f8f
|
@ -22,17 +22,6 @@ cmGlobalVisualStudio8Win64Generator::cmGlobalVisualStudio8Win64Generator()
|
||||||
this->ArchitectureId = "x64";
|
this->ArchitectureId = "x64";
|
||||||
}
|
}
|
||||||
|
|
||||||
///! Create a local generator appropriate to this Global Generator
|
|
||||||
cmLocalGenerator *cmGlobalVisualStudio8Win64Generator::CreateLocalGenerator()
|
|
||||||
{
|
|
||||||
cmLocalVisualStudio7Generator *lg
|
|
||||||
= new cmLocalVisualStudio7Generator(cmLocalVisualStudioGenerator::VS8);
|
|
||||||
lg->SetPlatformName(this->GetPlatformName());
|
|
||||||
lg->SetExtraFlagTable(this->GetExtraFlagTableVS8());
|
|
||||||
lg->SetGlobalGenerator(this);
|
|
||||||
return lg;
|
|
||||||
}
|
|
||||||
|
|
||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
void cmGlobalVisualStudio8Win64Generator
|
void cmGlobalVisualStudio8Win64Generator
|
||||||
::GetDocumentation(cmDocumentationEntry& entry) const
|
::GetDocumentation(cmDocumentationEntry& entry) const
|
||||||
|
|
|
@ -38,9 +38,6 @@ public:
|
||||||
/** Get the documentation entry for this generator. */
|
/** Get the documentation entry for this generator. */
|
||||||
virtual void GetDocumentation(cmDocumentationEntry& entry) const;
|
virtual void GetDocumentation(cmDocumentationEntry& entry) const;
|
||||||
|
|
||||||
///! create the correct local generator
|
|
||||||
virtual cmLocalGenerator *CreateLocalGenerator();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Try to determine system infomation such as shared library
|
* Try to determine system infomation such as shared library
|
||||||
* extension, pthreads, byte order etc.
|
* extension, pthreads, byte order etc.
|
||||||
|
|
|
@ -19,17 +19,6 @@ cmGlobalVisualStudio9IA64Generator::cmGlobalVisualStudio9IA64Generator()
|
||||||
this->ArchitectureId = "Itanium";
|
this->ArchitectureId = "Itanium";
|
||||||
}
|
}
|
||||||
|
|
||||||
///! Create a local generator appropriate to this Global Generator
|
|
||||||
cmLocalGenerator *cmGlobalVisualStudio9IA64Generator::CreateLocalGenerator()
|
|
||||||
{
|
|
||||||
cmLocalVisualStudio7Generator *lg =
|
|
||||||
new cmLocalVisualStudio7Generator(cmLocalVisualStudioGenerator::VS9);
|
|
||||||
lg->SetPlatformName(this->GetPlatformName());
|
|
||||||
lg->SetExtraFlagTable(this->GetExtraFlagTableVS8());
|
|
||||||
lg->SetGlobalGenerator(this);
|
|
||||||
return lg;
|
|
||||||
}
|
|
||||||
|
|
||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
void cmGlobalVisualStudio9IA64Generator
|
void cmGlobalVisualStudio9IA64Generator
|
||||||
::GetDocumentation(cmDocumentationEntry& entry) const
|
::GetDocumentation(cmDocumentationEntry& entry) const
|
||||||
|
|
|
@ -38,9 +38,6 @@ public:
|
||||||
/** Get the documentation entry for this generator. */
|
/** Get the documentation entry for this generator. */
|
||||||
virtual void GetDocumentation(cmDocumentationEntry& entry) const;
|
virtual void GetDocumentation(cmDocumentationEntry& entry) const;
|
||||||
|
|
||||||
///! create the correct local generator
|
|
||||||
virtual cmLocalGenerator *CreateLocalGenerator();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Try to determine system infomation such as shared library
|
* Try to determine system infomation such as shared library
|
||||||
* extension, pthreads, byte order etc.
|
* extension, pthreads, byte order etc.
|
||||||
|
|
|
@ -19,17 +19,6 @@ cmGlobalVisualStudio9Win64Generator::cmGlobalVisualStudio9Win64Generator()
|
||||||
this->ArchitectureId = "x64";
|
this->ArchitectureId = "x64";
|
||||||
}
|
}
|
||||||
|
|
||||||
///! Create a local generator appropriate to this Global Generator
|
|
||||||
cmLocalGenerator *cmGlobalVisualStudio9Win64Generator::CreateLocalGenerator()
|
|
||||||
{
|
|
||||||
cmLocalVisualStudio7Generator *lg =
|
|
||||||
new cmLocalVisualStudio7Generator(cmLocalVisualStudioGenerator::VS9);
|
|
||||||
lg->SetPlatformName(this->GetPlatformName());
|
|
||||||
lg->SetExtraFlagTable(this->GetExtraFlagTableVS8());
|
|
||||||
lg->SetGlobalGenerator(this);
|
|
||||||
return lg;
|
|
||||||
}
|
|
||||||
|
|
||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
void cmGlobalVisualStudio9Win64Generator
|
void cmGlobalVisualStudio9Win64Generator
|
||||||
::GetDocumentation(cmDocumentationEntry& entry) const
|
::GetDocumentation(cmDocumentationEntry& entry) const
|
||||||
|
|
|
@ -38,9 +38,6 @@ public:
|
||||||
/** Get the documentation entry for this generator. */
|
/** Get the documentation entry for this generator. */
|
||||||
virtual void GetDocumentation(cmDocumentationEntry& entry) const;
|
virtual void GetDocumentation(cmDocumentationEntry& entry) const;
|
||||||
|
|
||||||
///! create the correct local generator
|
|
||||||
virtual cmLocalGenerator *CreateLocalGenerator();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Try to determine system infomation such as shared library
|
* Try to determine system infomation such as shared library
|
||||||
* extension, pthreads, byte order etc.
|
* extension, pthreads, byte order etc.
|
||||||
|
|
Loading…
Reference in New Issue