diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2018-05-16 19:19:02 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2018-05-16 19:20:21 -0700 |
| commit | 1e03300470b5235b3026ff94e585adef8f961785 (patch) | |
| tree | 068e1fdc1d29699beed3ee4f6986f59fbc1ca5b4 /scripts | |
| parent | df28620ba6d5e11dbb492a89a042ece1810d8519 (diff) | |
| download | vcpkg-1e03300470b5235b3026ff94e585adef8f961785.tar.gz vcpkg-1e03300470b5235b3026ff94e585adef8f961785.zip | |
[ps1] Fix error when vs140comntools is not available
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/getVisualStudioInstances.ps1 | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/scripts/getVisualStudioInstances.ps1 b/scripts/getVisualStudioInstances.ps1 index 83b0b8ebd..910d0f98b 100644 --- a/scripts/getVisualStudioInstances.ps1 +++ b/scripts/getVisualStudioInstances.ps1 @@ -50,13 +50,16 @@ else Write-Verbose "Could not locate vswhere at $vswhereExe" } -$installationPath = Split-Path -Parent $(Split-Path -Parent "$env:vs140comntools") -$clExe = "$installationPath\VC\bin\cl.exe" -$vcvarsallbat = "$installationPath\VC\vcvarsall.bat" - -if ((Test-Path $clExe) -And (Test-Path $vcvarsallbat)) +if ("$env:vs140comntools" -ne "") { - $results.Add("<sol>::PreferenceWeight1::Legacy::14.0::$installationPath::<eol>") > $null + $installationPath = Split-Path -Parent $(Split-Path -Parent "$env:vs140comntools") + $clExe = "$installationPath\VC\bin\cl.exe" + $vcvarsallbat = "$installationPath\VC\vcvarsall.bat" + + if ((Test-Path $clExe) -And (Test-Path $vcvarsallbat)) + { + $results.Add("<sol>::PreferenceWeight1::Legacy::14.0::$installationPath::<eol>") > $null + } } $installationPath = "$programFiles\Microsoft Visual Studio 14.0" |