diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-10-16 17:04:55 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-10-16 17:04:55 -0700 |
| commit | 0051e7477be15c9746e9fb2babe15aaec47a7eef (patch) | |
| tree | c3ceb95c55ba62d33c3e08c8d24c936ade2021ed /scripts | |
| parent | e8f64049cf5d4b2f1b76bab49d5134bdd0dff1ea (diff) | |
| download | vcpkg-0051e7477be15c9746e9fb2babe15aaec47a7eef.tar.gz vcpkg-0051e7477be15c9746e9fb2babe15aaec47a7eef.zip | |
[findVS] Add detection for VS2015 Build Tools
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/findVisualStudioInstallationInstances.ps1 | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/scripts/findVisualStudioInstallationInstances.ps1 b/scripts/findVisualStudioInstallationInstances.ps1 index b2f186478..8a2adca10 100644 --- a/scripts/findVisualStudioInstallationInstances.ps1 +++ b/scripts/findVisualStudioInstallationInstances.ps1 @@ -32,6 +32,21 @@ foreach ($instance in $asXml.instances.instance) $results.Add("${releaseType}::${installationVersion}::${installationPath}") > $null } +# If nothing is found, attempt to find VS2015 Build Tools (not detected by vswhere.exe) +if ($results.Count -eq 0) +{ + $programFiles = & $scriptsDir\getProgramFiles32bit.ps1 + $installationPath = "$programFiles\Microsoft Visual Studio 14.0" + $clExe = "$installationPath\VC\bin\cl.exe" + $vcvarsallbat = "$installationPath\VC\vcvarsall.bat" + + if ((Test-Path $clExe) -And (Test-Path $vcvarsallbat)) + { + return "PreferenceWeight1::Legacy::14.0::$installationPath" + } +} + + $results.Sort() $results.Reverse() |