From 5ffbfecaf01bceed3263b2cd5829e4a5b8424ac6 Mon Sep 17 00:00:00 2001 From: Rob Smith Date: Mon, 20 Jul 2015 15:12:33 -0700 Subject: Add VS14 support to the solution generation code and fix the solution version number (12.0) --- QMTest/TestSConsMSVS.py | 2 +- src/engine/SCons/Tool/msvs.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/QMTest/TestSConsMSVS.py b/QMTest/TestSConsMSVS.py index 50a7956..65a09eb 100644 --- a/QMTest/TestSConsMSVS.py +++ b/QMTest/TestSConsMSVS.py @@ -515,7 +515,7 @@ EndGlobal """ expected_slnfile_14_0 = """\ -Microsoft Visual Studio Solution File, Format Version 14.00 +Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Test.vcxproj", "Test.vcxproj", "{39A97E1F-1A52-8954-A0B1-A10A8487545E}" EndProject diff --git a/src/engine/SCons/Tool/msvs.py b/src/engine/SCons/Tool/msvs.py index d00413d..8b74cf4 100644 --- a/src/engine/SCons/Tool/msvs.py +++ b/src/engine/SCons/Tool/msvs.py @@ -1535,7 +1535,9 @@ class _GenerateV7DSW(_DSWGenerator): def PrintSolution(self): """Writes a solution file""" self.file.write('Microsoft Visual Studio Solution File, Format Version %s\n' % self.versionstr) - if self.version_num >= 11.0: + if self.version_num >= 12.0: + self.file.write('# Visual Studio 14\n') + elif self.version_num >= 11.0: self.file.write('# Visual Studio 11\n') elif self.version_num >= 10.0: self.file.write('# Visual Studio 2010\n') -- cgit v0.12