From: Pyry Haulos <phaulos@google.com>
Date: Fri, 27 May 2016 15:39:15 +0000 (-0700)
Subject: Add Visual Studio 2015 generator to build scripts
X-Git-Tag: upstream/0.1.0~824^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=474f1d99289dbd6f6e8416b06b31476ecc1e5fa8;p=platform%2Fupstream%2FVK-GL-CTS.git

Add Visual Studio 2015 generator to build scripts

Change-Id: I9bd94dde94ee26d9b5ad4a2644dd98f2f544e662
---

diff --git a/scripts/build/config.py b/scripts/build/config.py
index 0e68a22..cad57a8 100644
--- a/scripts/build/config.py
+++ b/scripts/build/config.py
@@ -139,6 +139,7 @@ class VSProjectGenerator(CMakeGenerator):
 				10:		[(_winreg.HKEY_CLASSES_ROOT, "VisualStudio.DTE.10.0"), (_winreg.HKEY_LOCAL_MACHINE, "Software\\Microsoft\\VCExpress\\10.0")],
 				11:		[(_winreg.HKEY_CLASSES_ROOT, "VisualStudio.DTE.11.0"), (_winreg.HKEY_LOCAL_MACHINE, "Software\\Microsoft\\VCExpress\\11.0")],
 				12:		[(_winreg.HKEY_CLASSES_ROOT, "VisualStudio.DTE.12.0"), (_winreg.HKEY_LOCAL_MACHINE, "Software\\Microsoft\\VCExpress\\12.0")],
+				14:		[(_winreg.HKEY_CLASSES_ROOT, "VisualStudio.DTE.14.0"), (_winreg.HKEY_LOCAL_MACHINE, "Software\\Microsoft\\VCExpress\\14.0")],
 			}
 
 			if not self.version in keyMap:
@@ -162,6 +163,8 @@ VS2012_X32_GENERATOR	= VSProjectGenerator(11, VSProjectGenerator.ARCH_32BIT)
 VS2012_X64_GENERATOR	= VSProjectGenerator(11, VSProjectGenerator.ARCH_64BIT)
 VS2013_X32_GENERATOR	= VSProjectGenerator(12, VSProjectGenerator.ARCH_32BIT)
 VS2013_X64_GENERATOR	= VSProjectGenerator(12, VSProjectGenerator.ARCH_64BIT)
+VS2015_X32_GENERATOR	= VSProjectGenerator(14, VSProjectGenerator.ARCH_32BIT)
+VS2015_X64_GENERATOR	= VSProjectGenerator(14, VSProjectGenerator.ARCH_64BIT)
 
 def selectFirstAvailableGenerator (generators):
 	for generator in generators:
@@ -170,11 +173,13 @@ def selectFirstAvailableGenerator (generators):
 	return None
 
 ANY_VS_X32_GENERATOR	= selectFirstAvailableGenerator([
+								VS2015_X32_GENERATOR,
 								VS2013_X32_GENERATOR,
 								VS2012_X32_GENERATOR,
 								VS2010_X32_GENERATOR,
 							])
 ANY_VS_X64_GENERATOR	= selectFirstAvailableGenerator([
+								VS2015_X64_GENERATOR,
 								VS2013_X64_GENERATOR,
 								VS2012_X64_GENERATOR,
 								VS2010_X64_GENERATOR,
@@ -184,6 +189,8 @@ ANY_UNIX_GENERATOR		= selectFirstAvailableGenerator([
 								MAKEFILE_GENERATOR,
 							])
 ANY_GENERATOR			= selectFirstAvailableGenerator([
+								VS2015_X64_GENERATOR,
+								VS2015_X32_GENERATOR,
 								VS2013_X64_GENERATOR,
 								VS2012_X64_GENERATOR,
 								VS2010_X64_GENERATOR,