diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-02-09 15:26:40 -0800 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-02-09 15:26:40 -0800 |
| commit | cfd5adaf135ccfe2ade3bce43a00d27abd007b0a (patch) | |
| tree | 1abd86964ab72d3429527495cbe0f620430f87ce | |
| parent | 678f7faf0bb0f39fce56b375010e2ef07cbebbdb (diff) | |
| download | vcpkg-cfd5adaf135ccfe2ade3bce43a00d27abd007b0a.tar.gz vcpkg-cfd5adaf135ccfe2ade3bce43a00d27abd007b0a.zip | |
Improve WinSDK detection
| -rw-r--r-- | scripts/findTargetPlatformVersion.ps1 | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/scripts/findTargetPlatformVersion.ps1 b/scripts/findTargetPlatformVersion.ps1 index e9d676724..d3dba73f1 100644 --- a/scripts/findTargetPlatformVersion.ps1 +++ b/scripts/findTargetPlatformVersion.ps1 @@ -15,15 +15,16 @@ foreach ($ProgramFiles in $CandidateProgramFiles) continue } - $win10sdkVersions = Get-ChildItem $folder | Where-Object {$_.Name -match "^10"} | Sort-Object - $win10sdkVersionCount = $win10sdkVersions.Length + $win10sdkVersions = @(Get-ChildItem $folder | Where-Object {$_.Name -match "^10"} | Sort-Object) + [array]::Reverse($win10sdkVersions) # Newest SDK first - if ($win10sdkVersionCount -eq 0) + foreach ($win10sdkV in $win10sdkVersions) { - continue + if (Test-Path "$folder\$win10sdkV\um\windows.h") + { + return $win10sdkV.ToString() + } } - - return $win10sdkVersions[$win10sdkVersionCount - 1].ToString() } # Windows 8.1 SDK |