From 1e03300470b5235b3026ff94e585adef8f961785 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Wed, 16 May 2018 19:19:02 -0700 Subject: [ps1] Fix error when vs140comntools is not available --- scripts/getVisualStudioInstances.ps1 | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'scripts') 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("::PreferenceWeight1::Legacy::14.0::$installationPath::") > $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("::PreferenceWeight1::Legacy::14.0::$installationPath::") > $null + } } $installationPath = "$programFiles\Microsoft Visual Studio 14.0" -- cgit v1.2.3