diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/findAnyMSBuildWithCppPlatformToolset.ps1 | 14 | ||||
| -rw-r--r-- | scripts/getWindowsSDK.ps1 | 3 |
2 files changed, 8 insertions, 9 deletions
diff --git a/scripts/findAnyMSBuildWithCppPlatformToolset.ps1 b/scripts/findAnyMSBuildWithCppPlatformToolset.ps1 index 6ee368a54..f1ef1ae6b 100644 --- a/scripts/findAnyMSBuildWithCppPlatformToolset.ps1 +++ b/scripts/findAnyMSBuildWithCppPlatformToolset.ps1 @@ -54,12 +54,16 @@ foreach ($ProgramFiles in $CandidateProgramFiles) { $clExe= "$ProgramFiles\Microsoft Visual Studio 14.0\VC\bin\cl.exe" - if (Test-Path $clExe) + if (!(Test-Path $clExe)) { - $instance = New-MSBuildInstance "$ProgramFiles\MSBuild\14.0\Bin\MSBuild.exe" "v140" - Write-Verbose "Found $instance" - $validInstances.Add($instance) > $null + Write-Verbose "$clExe - Not Found" + continue } + + Write-Verbose "$clExe - Found" + $instance = New-MSBuildInstance "$ProgramFiles\MSBuild\14.0\Bin\MSBuild.exe" "v140" + Write-Verbose "Found $instance" + $validInstances.Add($instance) > $null } # VS2015 - through the registry @@ -84,7 +88,6 @@ $(NewCppRegistryPair "Registry::HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\visualstud foreach ($pair in $registryPairs) { $vsEntry = $pair.visualStudioEntry - Write-Verbose "$vsEntry - Checking" try { $VS14InstallDir = $(gp $vsEntry InstallDir -erroraction Stop | % { $_.InstallDir }) @@ -112,7 +115,6 @@ foreach ($pair in $registryPairs) Write-Verbose "$clExePath - Found" $msbuildEntry = $pair.msBuildEntry - Write-Verbose "$msbuildEntry - Checking" try { $MSBuild14 = $(gp $msbuildEntry MSBuildToolsPath -erroraction Stop | % { $_.MSBuildToolsPath }) diff --git a/scripts/getWindowsSDK.ps1 b/scripts/getWindowsSDK.ps1 index cc2188653..90ca1b06b 100644 --- a/scripts/getWindowsSDK.ps1 +++ b/scripts/getWindowsSDK.ps1 @@ -26,7 +26,6 @@ Write-Verbose "Looking for Windows 10 SDK" foreach ($ProgramFiles in $CandidateProgramFiles) { $folder = "$ProgramFiles\Windows Kits\10\Include" - Write-Verbose "$folder - Checking" if (!(Test-Path $folder)) { Write-Verbose "$folder - Not Found" @@ -40,7 +39,6 @@ foreach ($ProgramFiles in $CandidateProgramFiles) foreach ($win10sdkV in $win10sdkVersions) { $windowsheader = "$folder\$win10sdkV\um\windows.h" - Write-Verbose "$windowsheader - Checking" if (!(Test-Path $windowsheader)) { Write-Verbose "$windowsheader - Not Found" @@ -60,7 +58,6 @@ Write-Verbose "Looking for Windows 8.1 SDK" foreach ($ProgramFiles in $CandidateProgramFiles) { $folder = "$ProgramFiles\Windows Kits\8.1\Include" - Write-Verbose "$folder - Checking" if (!(Test-Path $folder)) { Write-Verbose "$folder - Not Found" |