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

Merge topic 'vs-sln-header' 

c677838 VS: Fix VS 10/11 .sln headers (#14038)
This commit is contained in:
Brad King 2013-03-26 14:36:32 -04:00 committed by CMake Topic Stage
parent a3872ba5f9 c677838c1a
commit c20f4dd620
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/cmGlobalVisualStudio10Generator.cxx
View File

@ -102,8 +102,15 @@ void cmGlobalVisualStudio10Generator::AddPlatformDefinitions(cmMakefile* mf)
void cmGlobalVisualStudio10Generator::WriteSLNHeader(std::ostream& fout) void cmGlobalVisualStudio10Generator::WriteSLNHeader(std::ostream& fout)
{ {
fout << "Microsoft Visual Studio Solution File, Format Version 11.00\n"; fout << "Microsoft Visual Studio Solution File, Format Version 11.00\n";
if (this->ExpressEdition)
{
fout << "# Visual C++ Express 2010\n";
}
else
{
fout << "# Visual Studio 2010\n"; fout << "# Visual Studio 2010\n";
} }
}
///! Create a local generator appropriate to this Global Generator ///! Create a local generator appropriate to this Global Generator
cmLocalGenerator *cmGlobalVisualStudio10Generator::CreateLocalGenerator() cmLocalGenerator *cmGlobalVisualStudio10Generator::CreateLocalGenerator()

9
Source/cmGlobalVisualStudio11Generator.cxx
View File

@ -81,7 +81,14 @@ cmGlobalVisualStudio11Generator::cmGlobalVisualStudio11Generator(
void cmGlobalVisualStudio11Generator::WriteSLNHeader(std::ostream& fout) void cmGlobalVisualStudio11Generator::WriteSLNHeader(std::ostream& fout)
{ {
fout << "Microsoft Visual Studio Solution File, Format Version 12.00\n"; fout << "Microsoft Visual Studio Solution File, Format Version 12.00\n";
fout << "# Visual Studio 11\n"; if (this->ExpressEdition)
{
fout << "# Visual Studio Express 2012 for Windows Desktop\n";
}
else
{
fout << "# Visual Studio 2012\n";
}
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------