aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2017-04-14 16:01:19 -0700
committerRobert Schumacher <roschuma@microsoft.com>2017-04-14 16:01:19 -0700
commit1c08a42091cb0addd1e0c1daf27d24bf4e9d237f (patch)
treef8c69e701dfae791fe180a8c24b35a4195668afd /scripts
parent23366aede0cb1ccfeac85a28308bc722811b18bc (diff)
parentb3541eff15847b2cc90736a609b8c6f99ce74a9d (diff)
downloadvcpkg-1c08a42091cb0addd1e0c1daf27d24bf4e9d237f.tar.gz
vcpkg-1c08a42091cb0addd1e0c1daf27d24bf4e9d237f.zip
Merge from master
Diffstat (limited to 'scripts')
-rw-r--r--scripts/getWindowsSDK.ps110
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