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

VS: Add hook to initialize Windows platform settings 

Give VS 10+ generators a chance to choose Windows platform settings just
as they already can for WindowsCE, WindowsStore, and WindowsPhone.
This commit is contained in:
Gilles Khouzam 2015-09-23 14:27:07 -07:00 committed by Brad King
parent 61c472a287
commit 5dfc4c5f50
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Source/cmGlobalVisualStudio10Generator.cxx
View File

@ -176,7 +176,14 @@ cmGlobalVisualStudio10Generator::SetGeneratorToolset(std::string const& ts,
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
bool cmGlobalVisualStudio10Generator::InitializeSystem(cmMakefile* mf) bool cmGlobalVisualStudio10Generator::InitializeSystem(cmMakefile* mf)
{ {
if (this->SystemName == "WindowsCE") if (this->SystemName == "Windows")
{
if (!this->InitializeWindows(mf))
{
return false;
}
}
else if (this->SystemName == "WindowsCE")
{ {
this->SystemIsWindowsCE = true; this->SystemIsWindowsCE = true;
if (!this->InitializeWindowsCE(mf)) if (!this->InitializeWindowsCE(mf))
@ -184,7 +191,7 @@ bool cmGlobalVisualStudio10Generator::InitializeSystem(cmMakefile* mf)
return false; return false;
} }
} }
else if(this->SystemName == "WindowsPhone") else if (this->SystemName == "WindowsPhone")
{ {
this->SystemIsWindowsPhone = true; this->SystemIsWindowsPhone = true;
if(!this->InitializeWindowsPhone(mf)) if(!this->InitializeWindowsPhone(mf))
@ -192,7 +199,7 @@ bool cmGlobalVisualStudio10Generator::InitializeSystem(cmMakefile* mf)
return false; return false;
} }
} }
else if(this->SystemName == "WindowsStore") else if (this->SystemName == "WindowsStore")
{ {
this->SystemIsWindowsStore = true; this->SystemIsWindowsStore = true;
if(!this->InitializeWindowsStore(mf)) if(!this->InitializeWindowsStore(mf))
@ -228,6 +235,12 @@ bool cmGlobalVisualStudio10Generator::InitializeSystem(cmMakefile* mf)
return true; return true;
} }
//----------------------------------------------------------------------------
bool cmGlobalVisualStudio10Generator::InitializeWindows(cmMakefile*)
{
return true;
}
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
bool cmGlobalVisualStudio10Generator::InitializeWindowsCE(cmMakefile* mf) bool cmGlobalVisualStudio10Generator::InitializeWindowsCE(cmMakefile* mf)
{ {

1
Source/cmGlobalVisualStudio10Generator.h
View File

@ -105,6 +105,7 @@ public:
protected: protected:
virtual void Generate(); virtual void Generate();
virtual bool InitializeSystem(cmMakefile* mf); virtual bool InitializeSystem(cmMakefile* mf);
virtual bool InitializeWindows(cmMakefile* mf);
virtual bool InitializeWindowsCE(cmMakefile* mf); virtual bool InitializeWindowsCE(cmMakefile* mf);
virtual bool InitializeWindowsPhone(cmMakefile* mf); virtual bool InitializeWindowsPhone(cmMakefile* mf);
virtual bool InitializeWindowsStore(cmMakefile* mf); virtual bool InitializeWindowsStore(cmMakefile* mf);