@@ -108,6 +108,29 @@ if defined NIGHTLY set TAG=nightly-%NIGHTLY%
108108
109109@ rem Set environment for msbuild
110110
111+ @ rem Look for Visual Studio 2015
112+ echo Looking for Visual Studio 2015
113+ if not defined VS140COMNTOOLS goto vc-set-2013
114+ if not exist " %VS140COMNTOOLS% \..\..\vc\vcvarsall.bat" goto vc-set-2013
115+ echo Found Visual Studio 2015
116+ if defined msi (
117+ echo Looking for WiX installation for Visual Studio 2015...
118+ if not exist " %WIX% \SDK\VS2015" (
119+ echo Failed to find WiX install for Visual Studio 2015
120+ echo VS2015 support for WiX is only present starting at version 3.10
121+ goto vc-set-2013
122+ )
123+ )
124+ if " %VCVARS_VER% " NEQ " 140" (
125+ call " %VS140COMNTOOLS% \..\..\vc\vcvarsall.bat"
126+ SET VCVARS_VER = 140
127+ )
128+ if not defined VCINSTALLDIR goto msbuild-not-found
129+ set GYP_MSVS_VERSION = 2015
130+ set PLATFORM_TOOLSET = v140
131+ goto msbuild-found
132+
133+ :vc-set-2013
111134@ rem Look for Visual Studio 2013
112135echo Looking for Visual Studio 2013
113136if not defined VS120COMNTOOLS goto vc-set-2012
@@ -117,6 +140,7 @@ if defined msi (
117140 echo Looking for WiX installation for Visual Studio 2013...
118141 if not exist " %WIX% \SDK\VS2013" (
119142 echo Failed to find WiX install for Visual Studio 2013
143+ echo VS2013 support for WiX is only present starting at version 3.8
120144 goto vc-set-2012
121145 )
122146)
0 commit comments