mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-19 07:43:39 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1934 from nerdile/dev/nerdile/fix-bootstrap-win10sdk-detection

Browse Source 
Fix Win10SDK detection during Bootstrap
This commit is contained in:
Alexander Karatarakis 2017-10-06 02:02:24 -07:00 committed by GitHub
commit 5e3d3fb8b4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/getWindowsSDK.ps1
View File

@ -20,7 +20,7 @@ $validInstances = New-Object System.Collections.ArrayList
# Windows 10 SDK # Windows 10 SDK
function CheckWindows10SDK($path) function CheckWindows10SDK($path)
{ {
$folder = "$path\Include" $folder = (Join-Path $path "Include")
if (!(Test-Path $folder)) if (!(Test-Path $folder))
{ {
Write-Verbose "$folder - Not Found" Write-Verbose "$folder - Not Found"
@ -37,7 +37,7 @@ function CheckWindows10SDK($path)
if (!(Test-Path $windowsheader)) if (!(Test-Path $windowsheader))
{ {
Write-Verbose "$windowsheader - Not Found" Write-Verbose "$windowsheader - Not Found"
return continue
} }
Write-Verbose "$windowsheader - Found" Write-Verbose "$windowsheader - Found"
@ -45,7 +45,7 @@ function CheckWindows10SDK($path)
if (!(Test-Path $ddkheader)) if (!(Test-Path $ddkheader))
{ {
Write-Verbose "$ddkheader - Not Found" Write-Verbose "$ddkheader - Not Found"
return continue
} }
Write-Verbose "$ddkheader - Found" Write-Verbose "$ddkheader - Found"