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

VS: Remove GetPlatformName from platform-specific generators 

Use the existing ArchitectureId to generate the PlatformName
to reduce duplicated information in the classes.
This commit is contained in:
Patrick Gansterer 2012-11-19 18:03:36 +01:00 committed by Brad King
parent 8d42ab4260
commit 5bdf01184b
9 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmGlobalVisualStudio10IA64Generator.h
View File

@ -28,8 +28,6 @@ public:
return cmGlobalVisualStudio10IA64Generator::GetActualName();}
static const char* GetActualName() {return "Visual Studio 10 IA64";}
virtual const char* GetPlatformName() const {return "Itanium";}
/** Get the documentation entry for this generator. */
static void GetDocumentation(cmDocumentationEntry& entry);

2
Source/cmGlobalVisualStudio10Win64Generator.h
View File

@ -28,8 +28,6 @@ public:
return cmGlobalVisualStudio10Win64Generator::GetActualName();}
static const char* GetActualName() {return "Visual Studio 10 Win64";}
virtual const char* GetPlatformName() const {return "x64";}
/** Get the documentation entry for this generator. */
static void GetDocumentation(cmDocumentationEntry& entry);

2
Source/cmGlobalVisualStudio11ARMGenerator.h
View File

@ -28,8 +28,6 @@ public:
return cmGlobalVisualStudio11ARMGenerator::GetActualName();}
static const char* GetActualName() {return "Visual Studio 11 ARM";}
virtual const char* GetPlatformName() const {return "ARM";}
/** Get the documentation entry for this generator. */
static void GetDocumentation(cmDocumentationEntry& entry);
};

2
Source/cmGlobalVisualStudio11Win64Generator.h
View File

@ -28,8 +28,6 @@ public:
return cmGlobalVisualStudio11Win64Generator::GetActualName();}
static const char* GetActualName() {return "Visual Studio 11 Win64";}
virtual const char* GetPlatformName() const {return "x64";}
/** Get the documentation entry for this generator. */
static void GetDocumentation(cmDocumentationEntry& entry);
};

10
Source/cmGlobalVisualStudio8Generator.cxx
View File

@ -23,6 +23,16 @@ cmGlobalVisualStudio8Generator::cmGlobalVisualStudio8Generator()
this->ProjectConfigurationSectionName = "ProjectConfigurationPlatforms";
}
//----------------------------------------------------------------------------
const char* cmGlobalVisualStudio8Generator::GetPlatformName() const
{
if (!strcmp(this->ArchitectureId, "X86"))
{
return "Win32";
}
return this->ArchitectureId;
}
//----------------------------------------------------------------------------
///! Create a local generator appropriate to this Global Generator
cmLocalGenerator *cmGlobalVisualStudio8Generator::CreateLocalGenerator()

2
Source/cmGlobalVisualStudio8Generator.h
View File

@ -33,7 +33,7 @@ public:
return cmGlobalVisualStudio8Generator::GetActualName();}
static const char* GetActualName() {return "Visual Studio 8 2005";}
virtual const char* GetPlatformName() const {return "Win32";}
const char* GetPlatformName() const;
/** Get the documentation entry for this generator. */
static void GetDocumentation(cmDocumentationEntry& entry);

2
Source/cmGlobalVisualStudio8Win64Generator.h
View File

@ -34,8 +34,6 @@ public:
return cmGlobalVisualStudio8Win64Generator::GetActualName();}
static const char* GetActualName() {return "Visual Studio 8 2005 Win64";}
virtual const char* GetPlatformName() const {return "x64";}
/** Get the documentation entry for this generator. */
static void GetDocumentation(cmDocumentationEntry& entry);
};

2
Source/cmGlobalVisualStudio9IA64Generator.h
View File

@ -34,8 +34,6 @@ public:
return cmGlobalVisualStudio9IA64Generator::GetActualName();}
static const char* GetActualName() {return "Visual Studio 9 2008 IA64";}
virtual const char* GetPlatformName() const {return "Itanium";}
/** Get the documentation entry for this generator. */
static void GetDocumentation(cmDocumentationEntry& entry);
};

2
Source/cmGlobalVisualStudio9Win64Generator.h
View File

@ -34,8 +34,6 @@ public:
return cmGlobalVisualStudio9Win64Generator::GetActualName();}
static const char* GetActualName() {return "Visual Studio 9 2008 Win64";}
virtual const char* GetPlatformName() const {return "x64";}
/** Get the documentation entry for this generator. */
static void GetDocumentation(cmDocumentationEntry& entry);
};