aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2017-02-21 17:42:39 -0800
committerAlexander Karatarakis <alkarata@microsoft.com>2017-02-21 17:45:08 -0800
commita2cebceafec8341fcab0236a3c81a27f935aeb38 (patch)
treef26175913cbbb3df4ab20e7342067331313b9a15 /scripts
parent1dd675a785ddce82b2ff4b164ed10f8b9789a5c7 (diff)
downloadvcpkg-a2cebceafec8341fcab0236a3c81a27f935aeb38.tar.gz
vcpkg-a2cebceafec8341fcab0236a3c81a27f935aeb38.zip
Rename findTargetPlatformVersion to getWindowsSDK
Diffstat (limited to 'scripts')
-rw-r--r--scripts/bootstrap.ps14
-rw-r--r--scripts/getWindowsSDK.ps1 (renamed from scripts/findTargetPlatformVersion.ps1)0
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1
index 9907e31fb..fea05964b 100644
--- a/scripts/bootstrap.ps1
+++ b/scripts/bootstrap.ps1
@@ -26,8 +26,8 @@ try{
$msbuildExeWithPlatformToolset = & $scriptsDir\findAnyMSBuildWithCppPlatformToolset.ps1
$msbuildExe = $msbuildExeWithPlatformToolset[0]
$platformToolset = $msbuildExeWithPlatformToolset[1]
- $targetPlatformVersion = & $scriptsDir\findTargetPlatformVersion.ps1
- & $msbuildExe "/p:VCPKG_VERSION=-$gitHash" "/p:DISABLE_METRICS=$disableMetrics" /p:Configuration=Release /p:Platform=x86 /p:PlatformToolset=$platformToolset /p:TargetPlatformVersion=$targetPlatformVersion /m dirs.proj
+ $windowsSDK = & $scriptsDir\getWindowsSDK.ps1
+ & $msbuildExe "/p:VCPKG_VERSION=-$gitHash" "/p:DISABLE_METRICS=$disableMetrics" /p:Configuration=Release /p:Platform=x86 /p:PlatformToolset=$platformToolset /p:TargetPlatformVersion=$windowsSDK /m dirs.proj
Write-Verbose("Placing vcpkg.exe in the correct location")
diff --git a/scripts/findTargetPlatformVersion.ps1 b/scripts/getWindowsSDK.ps1
index 650e0b4ed..650e0b4ed 100644
--- a/scripts/findTargetPlatformVersion.ps1
+++ b/scripts/getWindowsSDK.ps1