diff options
| author | Brad King <brad.king@kitware.com> | 2013-03-26 18:36:32 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-03-26 18:36:32 (GMT) |
| commit | c20f4dd62090a109c932c75030ea22771396a722 (patch) | |
| tree | 410efe0e77bcde5f955ae447959b5431fbef0f6f | |
| parent | a3872ba5f9df51c97989da0f1df1156f878956f0 (diff) | |
| parent | c677838c1a608dd182b238154050a94ab79d6bc4 (diff) | |
| download | CMake-c20f4dd62090a109c932c75030ea22771396a722.zip CMake-c20f4dd62090a109c932c75030ea22771396a722.tar.gz CMake-c20f4dd62090a109c932c75030ea22771396a722.tar.bz2 | |
Merge topic 'vs-sln-header'
c677838 VS: Fix VS 10/11 .sln headers (#14038)
| -rw-r--r-- | Source/cmGlobalVisualStudio10Generator.cxx | 9 | ||||
| -rw-r--r-- | Source/cmGlobalVisualStudio11Generator.cxx | 9 |
2 files changed, 16 insertions, 2 deletions
diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx index cac72fc..b8c4939 100644 --- a/Source/cmGlobalVisualStudio10Generator.cxx +++ b/Source/cmGlobalVisualStudio10Generator.cxx @@ -102,7 +102,14 @@ void cmGlobalVisualStudio10Generator::AddPlatformDefinitions(cmMakefile* mf) void cmGlobalVisualStudio10Generator::WriteSLNHeader(std::ostream& fout) { fout << "Microsoft Visual Studio Solution File, Format Version 11.00\n"; - fout << "# Visual Studio 2010\n"; + if (this->ExpressEdition) + { + fout << "# Visual C++ Express 2010\n"; + } + else + { + fout << "# Visual Studio 2010\n"; + } } ///! Create a local generator appropriate to this Global Generator diff --git a/Source/cmGlobalVisualStudio11Generator.cxx b/Source/cmGlobalVisualStudio11Generator.cxx index b6d7d04..299aaa8 100644 --- a/Source/cmGlobalVisualStudio11Generator.cxx +++ b/Source/cmGlobalVisualStudio11Generator.cxx @@ -81,7 +81,14 @@ cmGlobalVisualStudio11Generator::cmGlobalVisualStudio11Generator( void cmGlobalVisualStudio11Generator::WriteSLNHeader(std::ostream& fout) { 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"; + } } //---------------------------------------------------------------------------- |