@@ -82,9 +82,17 @@ if defined noetw set noetw_arg=--without-etw& set noetw_msi_arg=/p:NoETW=1
82
82
if defined noperfctr set noperfctr_arg = --without-perfctr& set noperfctr_msi_arg = /p:NoPerfCtr=1
83
83
84
84
@ rem Look for Visual Studio 2013
85
+ echo Looking for Visual Studio 2013
85
86
if not defined VS120COMNTOOLS goto vc-set-2012
86
87
if not exist " %VS120COMNTOOLS% \..\..\vc\vcvarsall.bat" goto vc-set-2012
87
- if defined msi if not exist " %WIX% \SDK\VS2013" goto vc-set-2012
88
+ echo Found Visual Studio 2013
89
+ if defined msi (
90
+ echo Looking for WiX installation for VStudio 2013...
91
+ if not exist " %WIX% \SDK\VS2013" (
92
+ echo Failed to find WiX install for VStudio 2013
93
+ goto vc-set-2012
94
+ )
95
+ )
88
96
call " %VS120COMNTOOLS% \..\..\vc\vcvarsall.bat"
89
97
if not defined VCINSTALLDIR goto msbuild-not-found
90
98
set GYP_MSVS_VERSION = 2013
@@ -93,19 +101,35 @@ goto msbuild-found
93
101
94
102
:vc-set-2012
95
103
@ rem Look for Visual Studio 2012
104
+ echo Looking for Visual Studio 2012
96
105
if not defined VS110COMNTOOLS goto vc-set-2010
97
106
if not exist " %VS110COMNTOOLS% \..\..\vc\vcvarsall.bat" goto vc-set-2010
98
- if defined msi if not exist " %WIX% \SDK\VS2012" goto vc-set-2010
107
+ echo Found Visual Studio 2012
108
+ if defined msi (
109
+ echo Looking for WiX installation for VStudio 2012...
110
+ if not exist " %WIX% \SDK\VS2012" (
111
+ echo Failed to find WiX install for VStudio 2012
112
+ goto vc-set-2010
113
+ )
114
+ )
99
115
call " %VS110COMNTOOLS% \..\..\vc\vcvarsall.bat"
100
116
if not defined VCINSTALLDIR goto msbuild-not-found
101
117
set GYP_MSVS_VERSION = 2012
102
118
set PLATFORM_TOOLSET = v110
103
119
goto msbuild-found
104
120
105
121
:vc-set-2010
122
+ echo Looking for Visual Studio 2010
106
123
if not defined VS100COMNTOOLS goto msbuild-not-found
107
124
if not exist " %VS100COMNTOOLS% \..\..\vc\vcvarsall.bat" goto msbuild-not-found
108
- if defined msi if not exist " %WIX% \SDK\VS2010" goto wix-not-found
125
+ echo Found Visual Studio 2010
126
+ if defined msi (
127
+ echo Looking for WiX installation for VStudio 2010...
128
+ if not exist " %WIX% \SDK\VS2010" (
129
+ echo Failed to find WiX install for VStudio 2010
130
+ goto wix-not-found
131
+ )
132
+ )
109
133
call " %VS100COMNTOOLS% \..\..\vc\vcvarsall.bat"
110
134
if not defined VCINSTALLDIR goto msbuild-not-found
111
135
set GYP_MSVS_VERSION = 2010
0 commit comments