aboutsummaryrefslogtreecommitdiff
path: root/scripts/getWindowsSDK.ps1
diff options
context:
space:
mode:
authorBarath Kannan <barathsotd@gmail.com>2017-10-17 20:25:12 +1100
committerBarath Kannan <barathsotd@gmail.com>2017-10-17 20:25:12 +1100
commit48128e5b4dc964a306737e829affe349d8c6956c (patch)
tree414b608b8ad3037d0324bb77c83881c4306ef521 /scripts/getWindowsSDK.ps1
parentddc421acbc8bc9dd1d448190ac173b9d11e942dd (diff)
parent7ed8d4f75e903fdad4c02b4e784f2f4bcb30a3b0 (diff)
downloadvcpkg-48128e5b4dc964a306737e829affe349d8c6956c.tar.gz
vcpkg-48128e5b4dc964a306737e829affe349d8c6956c.zip
Merge branch 'master' of https://github.com/Microsoft/vcpkg into qt5_modular
Diffstat (limited to 'scripts/getWindowsSDK.ps1')
-rw-r--r--scripts/getWindowsSDK.ps110
1 files changed, 10 insertions, 0 deletions
diff --git a/scripts/getWindowsSDK.ps1 b/scripts/getWindowsSDK.ps1
index 8ef26a436..ed2fd11c7 100644
--- a/scripts/getWindowsSDK.ps1
+++ b/scripts/getWindowsSDK.ps1
@@ -19,6 +19,11 @@ $validInstances = New-Object System.Collections.ArrayList
# Windows 10 SDK
function CheckWindows10SDK($path)
{
+ if ($path -eq $null)
+ {
+ return
+ }
+
$folder = (Join-Path $path "Include")
if (!(Test-Path $folder))
{
@@ -64,6 +69,11 @@ CheckWindows10SDK("${env:ProgramFiles(x86)}\Windows Kits\10")
# Windows 8.1 SDK
function CheckWindows81SDK($path)
{
+ if ($path -eq $null)
+ {
+ return
+ }
+
$folder = "$path\Include"
if (!(Test-Path $folder))
{