diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-04-13 18:59:13 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-04-13 18:59:13 -0700 |
| commit | bfb76e52a4fabf18301ccecd778dbd47ef06f930 (patch) | |
| tree | cae8f7b432953a8b17e9da6d4843c3aca15bbb7b /scripts/getWindowsSDK.ps1 | |
| parent | 2fa9be1977f1dc7be5584b1bd0b7627b2c852abe (diff) | |
| download | vcpkg-bfb76e52a4fabf18301ccecd778dbd47ef06f930.tar.gz vcpkg-bfb76e52a4fabf18301ccecd778dbd47ef06f930.zip | |
[vcpkg] Fix getWindowsSDK to correctly handle the new optional c++ desktop deployment of the Windows SDK.
Diffstat (limited to 'scripts/getWindowsSDK.ps1')
| -rw-r--r-- | scripts/getWindowsSDK.ps1 | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/scripts/getWindowsSDK.ps1 b/scripts/getWindowsSDK.ps1 index 90ca1b06b..7902707cb 100644 --- a/scripts/getWindowsSDK.ps1 +++ b/scripts/getWindowsSDK.ps1 @@ -44,8 +44,16 @@ foreach ($ProgramFiles in $CandidateProgramFiles) Write-Verbose "$windowsheader - Not Found" continue } - Write-Verbose "$windowsheader - Found" + + $ddkheader = "$folder\$win10sdkV\shared\sdkddkver.h" + if (!(Test-Path $ddkheader)) + { + Write-Verbose "$ddkheader - Not Found" + continue + } + + Write-Verbose "$ddkheader - Found" $win10sdkVersionString = $win10sdkV.ToString() Write-Verbose "Found $win10sdkVersionString" $validInstances.Add($win10sdkVersionString) > $null |