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

VS: Refactor internal default platform name selection 

Rename the 'PlatformName' member to 'DefaultPlatformName' and make
sure it is only read through a 'GetPlatformName()' call.  This will
allow non-default names to be chosen later.
This commit is contained in:
Brad King 2014-09-05 14:02:58 -04:00
parent ad2a4776aa
commit 68d4280ac4
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmGlobalVisualStudio10Generator.cxx
View File

@ -125,7 +125,7 @@ bool cmGlobalVisualStudio10Generator::SetSystemName(std::string const& s,
{ {
return false; return false;
} }
if(this->PlatformName == "Itanium" || this->PlatformName == "x64") if(this->GetPlatformName() == "Itanium" || this->GetPlatformName() == "x64")
{ {
if(this->IsExpressEdition() && !this->Find64BitTools(mf)) if(this->IsExpressEdition() && !this->Find64BitTools(mf))
{ {

14
Source/cmGlobalVisualStudio7Generator.cxx
View File

@ -27,11 +27,11 @@ cmGlobalVisualStudio7Generator::cmGlobalVisualStudio7Generator(
if (platformName.empty()) if (platformName.empty())
{ {
this->PlatformName = "Win32"; this->DefaultPlatformName = "Win32";
} }
else else
{ {
this->PlatformName = platformName; this->DefaultPlatformName = platformName;
} }
} }
@ -259,15 +259,21 @@ cmLocalGenerator *cmGlobalVisualStudio7Generator::CreateLocalGenerator()
return lg; return lg;
} }
//----------------------------------------------------------------------------
std::string const& cmGlobalVisualStudio7Generator::GetPlatformName() const
{
return this->DefaultPlatformName;
}
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
bool cmGlobalVisualStudio7Generator::SetSystemName(std::string const& s, bool cmGlobalVisualStudio7Generator::SetSystemName(std::string const& s,
cmMakefile* mf) cmMakefile* mf)
{ {
if(this->PlatformName == "x64") if(this->GetPlatformName() == "x64")
{ {
mf->AddDefinition("CMAKE_FORCE_WIN64", "TRUE"); mf->AddDefinition("CMAKE_FORCE_WIN64", "TRUE");
} }
else if(this->PlatformName == "Itanium") else if(this->GetPlatformName() == "Itanium")
{ {
mf->AddDefinition("CMAKE_FORCE_IA64", "TRUE"); mf->AddDefinition("CMAKE_FORCE_IA64", "TRUE");
} }

4
Source/cmGlobalVisualStudio7Generator.h
View File

@ -39,7 +39,7 @@ public:
static std::string GetActualName() {return "Visual Studio 7";} static std::string GetActualName() {return "Visual Studio 7";}
///! Get the name for the platform. ///! Get the name for the platform.
const std::string& GetPlatformName() const { return this->PlatformName; } std::string const& GetPlatformName() const;
///! Create a local generator appropriate to this Global Generator ///! Create a local generator appropriate to this Global Generator
virtual cmLocalGenerator *CreateLocalGenerator(); virtual cmLocalGenerator *CreateLocalGenerator();
@ -175,7 +175,7 @@ protected:
// Set during OutputSLNFile with the name of the current project. // Set during OutputSLNFile with the name of the current project.
// There is one SLN file per project. // There is one SLN file per project.
std::string CurrentProject; std::string CurrentProject;
std::string PlatformName; std::string DefaultPlatformName;
bool MasmEnabled; bool MasmEnabled;
private: private: