aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2017-07-28 17:05:38 -0700
committerRobert Schumacher <roschuma@microsoft.com>2017-07-28 17:05:38 -0700
commit7c6c706160528c9234a91161b834529d4e13d761 (patch)
tree1945eb9777da1010c25c9fd53366eef4a2f82fa7 /scripts
parent509b59b7aea7611d8f2203ebd7b6357ba772afb7 (diff)
downloadvcpkg-7c6c706160528c9234a91161b834529d4e13d761.tar.gz
vcpkg-7c6c706160528c9234a91161b834529d4e13d761.zip
[vcpkg-getWindowsSDK] Also look in the paths, just in case.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/getWindowsSDK.ps15
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/getWindowsSDK.ps1 b/scripts/getWindowsSDK.ps1
index 3aa23cc56..9aebae8e3 100644
--- a/scripts/getWindowsSDK.ps1
+++ b/scripts/getWindowsSDK.ps1
@@ -59,7 +59,8 @@ Write-Verbose "`n"
Write-Verbose "Looking for Windows 10 SDK"
CheckWindows10SDK((Get-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows Kits\Installed Roots\' -Name 'KitsRoot10' -ErrorAction SilentlyContinue).KitsRoot10)
CheckWindows10SDK((Get-ItemProperty -Path 'HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows Kits\Installed Roots\' -Name 'KitsRoot10' -ErrorAction SilentlyContinue).KitsRoot10)
-
+CheckWindows10SDK("$env:ProgramFiles\Windows Kits\10")
+CheckWindows10SDK("${env:ProgramFiles(x86)}\Windows Kits\10")
# Windows 8.1 SDK
function CheckWindows81SDK($path)
@@ -81,6 +82,8 @@ Write-Verbose "`n"
Write-Verbose "Looking for Windows 8.1 SDK"
CheckWindows81SDK((Get-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows Kits\Installed Roots\' -Name 'KitsRoot81' -ErrorAction SilentlyContinue).KitsRoot81)
CheckWindows81SDK((Get-ItemProperty -Path 'HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows Kits\Installed Roots\' -Name 'KitsRoot81' -ErrorAction SilentlyContinue).KitsRoot81)
+CheckWindows81SDK("$env:ProgramFiles\Windows Kits\8.1")
+CheckWindows81SDK("${env:ProgramFiles(x86)}\Windows Kits\8.1")
Write-Verbose "`n`n`n"
Write-Verbose "The following Windows SDKs were found:"