From 8fc1447da763ffccd06efe171f1827ec018d2da2 Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Mon, 13 Mar 2017 14:02:28 -0700
Subject: [vcpkg_build_msbuild] Default to overriding WinSDK version

---
 scripts/cmake/vcpkg_build_msbuild.cmake | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

(limited to 'scripts')

diff --git a/scripts/cmake/vcpkg_build_msbuild.cmake b/scripts/cmake/vcpkg_build_msbuild.cmake
index 7de06241c..d143a6a81 100644
--- a/scripts/cmake/vcpkg_build_msbuild.cmake
+++ b/scripts/cmake/vcpkg_build_msbuild.cmake
@@ -47,20 +47,25 @@ function(vcpkg_build_msbuild)
     if(NOT DEFINED _csc_PLATFORM)
         set(_csc_PLATFORM ${TRIPLET_SYSTEM_ARCH})
     endif()
-    if(DEFINED _csc_TARGET_PLATFORM_VERSION)
-        set(_csc_TARGET_PLATFORM_VERSION /p:WindowsTargetPlatformVersion=${_csc_TARGET_PLATFORM_VERSION})
+    if(NOT DEFINED _csc_TARGET_PLATFORM_VERSION)
+        vcpkg_get_windows_sdk(_csc_TARGET_PLATFORM_VERSION)
     endif()
 
+    list(APPEND _csc_OPTIONS
+        /p:Platform=${_csc_PLATFORM}
+        /p:VCPkgLocalAppDataDisabled=true
+        /p:UseIntelMKL=No
+        /p:WindowsTargetPlatformVersion=${_csc_TARGET_PLATFORM_VERSION}
+        /m
+    )
+
     message(STATUS "Building ${_csc_PROJECT_PATH} for Release")
     file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
     vcpkg_execute_required_process(
-        COMMAND msbuild ${_csc_PROJECT_PATH} ${_csc_OPTIONS} ${_csc_OPTIONS_RELEASE}
+        COMMAND msbuild ${_csc_PROJECT_PATH}
             /p:Configuration=${_csc_RELEASE_CONFIGURATION}
-            /p:Platform=${_csc_PLATFORM}
-            /p:VCPkgLocalAppDataDisabled=true
-            /p:UseIntelMKL=No
-            ${_csc_TARGET_PLATFORM_VERSION}
-            /m
+            ${_csc_OPTIONS}
+            ${_csc_OPTIONS_RELEASE}
         WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
         LOGNAME build-${TARGET_TRIPLET}-rel
     )
@@ -68,13 +73,10 @@ function(vcpkg_build_msbuild)
     message(STATUS "Building ${_csc_PROJECT_PATH} for Debug")
     file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
     vcpkg_execute_required_process(
-        COMMAND msbuild ${_csc_PROJECT_PATH} ${_csc_OPTIONS} ${_csc_OPTIONS_DEBUG}
+        COMMAND msbuild ${_csc_PROJECT_PATH}
             /p:Configuration=${_csc_DEBUG_CONFIGURATION}
-            /p:Platform=${_csc_PLATFORM}
-            /p:VCPkgLocalAppDataDisabled=true
-            /p:UseIntelMKL=No
-            ${_csc_TARGET_PLATFORM_VERSION}  
-            /m
+            ${_csc_OPTIONS}
+            ${_csc_OPTIONS_DEBUG}
         WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
         LOGNAME build-${TARGET_TRIPLET}-dbg
     )
-- 
cgit v1.2.3