diff options
| author | Alexander Karatarakis <alex@karatarakis.com> | 2017-10-06 02:02:24 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-06 02:02:24 -0700 |
| commit | 5e3d3fb8b42e7fbab846095068af1eea387ce5a2 (patch) | |
| tree | 23efe5cd554b64027be2b476af199dd9428ca517 /scripts | |
| parent | cf7762a82ea044b33ddadd6b1d01a4035af3bf9d (diff) | |
| parent | 0643bd6581182a537b23c885b1c6b27e33e61dc4 (diff) | |
| download | vcpkg-5e3d3fb8b42e7fbab846095068af1eea387ce5a2.tar.gz vcpkg-5e3d3fb8b42e7fbab846095068af1eea387ce5a2.zip | |
Merge pull request #1934 from nerdile/dev/nerdile/fix-bootstrap-win10sdk-detection
Fix Win10SDK detection during Bootstrap
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/getWindowsSDK.ps1 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/getWindowsSDK.ps1 b/scripts/getWindowsSDK.ps1 index 9aebae8e3..f4537ddc3 100644 --- a/scripts/getWindowsSDK.ps1 +++ b/scripts/getWindowsSDK.ps1 @@ -20,7 +20,7 @@ $validInstances = New-Object System.Collections.ArrayList # Windows 10 SDK function CheckWindows10SDK($path) { - $folder = "$path\Include" + $folder = (Join-Path $path "Include") if (!(Test-Path $folder)) { Write-Verbose "$folder - Not Found" @@ -37,7 +37,7 @@ function CheckWindows10SDK($path) if (!(Test-Path $windowsheader)) { Write-Verbose "$windowsheader - Not Found" - return + continue } Write-Verbose "$windowsheader - Found" @@ -45,7 +45,7 @@ function CheckWindows10SDK($path) if (!(Test-Path $ddkheader)) { Write-Verbose "$ddkheader - Not Found" - return + continue } Write-Verbose "$ddkheader - Found" @@ -106,4 +106,4 @@ foreach ($instance in $validInstances) } } -throw "Could not detect a Windows SDK / TargetPlatformVersion"
\ No newline at end of file +throw "Could not detect a Windows SDK / TargetPlatformVersion" |