From 2efbe4ec6f211326c395f2b0a075de2ce07a2d4a Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Fri, 28 Oct 2016 18:58:39 -0700
Subject: [vcpkg.targets] Change VCPkg casing to Vcpkg

---
 scripts/buildsystems/msbuild/vcpkg.targets | 44 +++++++++++++++---------------
 1 file changed, 22 insertions(+), 22 deletions(-)

(limited to 'scripts/buildsystems')

diff --git a/scripts/buildsystems/msbuild/vcpkg.targets b/scripts/buildsystems/msbuild/vcpkg.targets
index 3a74099f0..0d89fedd3 100644
--- a/scripts/buildsystems/msbuild/vcpkg.targets
+++ b/scripts/buildsystems/msbuild/vcpkg.targets
@@ -1,56 +1,56 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition="'$(Platform)|$(ApplicationType)|$(ApplicationTypeRevision)' == 'Win32||'">
-    <VCPkgEnabled Condition="'$(VCPkgEnabled)' == ''">true</VCPkgEnabled>
-    <VCPkgTriplet Condition="'$(VCPkgTriplet)' == ''">x86-windows</VCPkgTriplet>
+    <VcpkgEnabled Condition="'$(VcpkgEnabled)' == ''">true</VcpkgEnabled>
+    <VcpkgTriplet Condition="'$(VcpkgTriplet)' == ''">x86-windows</VcpkgTriplet>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Platform)|$(ApplicationType)|$(ApplicationTypeRevision)' == 'Win32|Windows Store|10.0'">
-    <VCPkgEnabled Condition="'$(VCPkgEnabled)' == ''">true</VCPkgEnabled>
-    <VCPkgTriplet Condition="'$(VCPkgTriplet)' == ''">x86-uwp</VCPkgTriplet>
+    <VcpkgEnabled Condition="'$(VcpkgEnabled)' == ''">true</VcpkgEnabled>
+    <VcpkgTriplet Condition="'$(VcpkgTriplet)' == ''">x86-uwp</VcpkgTriplet>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Platform)|$(ApplicationType)|$(ApplicationTypeRevision)' == 'x64||'">
-    <VCPkgEnabled Condition="'$(VCPkgEnabled)' == ''">true</VCPkgEnabled>
-    <VCPkgTriplet Condition="'$(VCPkgTriplet)' == ''">x64-windows</VCPkgTriplet>
+    <VcpkgEnabled Condition="'$(VcpkgEnabled)' == ''">true</VcpkgEnabled>
+    <VcpkgTriplet Condition="'$(VcpkgTriplet)' == ''">x64-windows</VcpkgTriplet>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Platform)|$(ApplicationType)|$(ApplicationTypeRevision)' == 'x64|Windows Store|10.0'">
-    <VCPkgEnabled Condition="'$(VCPkgEnabled)' == ''">true</VCPkgEnabled>
-    <VCPkgTriplet Condition="'$(VCPkgTriplet)' == ''">x64-uwp</VCPkgTriplet>
+    <VcpkgEnabled Condition="'$(VcpkgEnabled)' == ''">true</VcpkgEnabled>
+    <VcpkgTriplet Condition="'$(VcpkgTriplet)' == ''">x64-uwp</VcpkgTriplet>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Platform)|$(ApplicationType)|$(ApplicationTypeRevision)' == 'arm|Windows Store|10.0'">
-    <VCPkgEnabled Condition="'$(VCPkgEnabled)' == ''">true</VCPkgEnabled>
-    <VCPkgTriplet Condition="'$(VCPkgTriplet)' == ''">arm-uwp</VCPkgTriplet>
+    <VcpkgEnabled Condition="'$(VcpkgEnabled)' == ''">true</VcpkgEnabled>
+    <VcpkgTriplet Condition="'$(VcpkgTriplet)' == ''">arm-uwp</VcpkgTriplet>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(VCPkgEnabled)' == 'true'">
-    <VCPkgConfiguration Condition="'$(VCPkgConfiguration)' == ''">$(Configuration)</VCPkgConfiguration>
+  <PropertyGroup Condition="'$(VcpkgEnabled)' == 'true'">
+    <VcpkgConfiguration Condition="'$(VcpkgConfiguration)' == ''">$(Configuration)</VcpkgConfiguration>
     <!-- Expected to ..\..\..\ over scripts\buildsystems\msbuild -->
-    <VCPkgRoot Condition="'$(VCPkgRoot)' == ''">$(MSBuildThisFileDirectory)..\..\..\installed\$(VCPkgTriplet)\</VCPkgRoot>
+    <VcpkgRoot Condition="'$(VcpkgRoot)' == ''">$(MSBuildThisFileDirectory)..\..\..\installed\$(VcpkgTriplet)\</VcpkgRoot>
   </PropertyGroup>
 
-  <ItemDefinitionGroup Condition="'$(VCPkgEnabled)' == 'true'">
+  <ItemDefinitionGroup Condition="'$(VcpkgEnabled)' == 'true'">
     <Link>
-      <AdditionalDependencies Condition="'$(VCPkgConfiguration)' == 'Debug'">$(VCPkgRoot)debug\lib\*.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalDependencies Condition="'$(VCPkgConfiguration)' == 'Release'">$(VCPkgRoot)lib\*.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies Condition="'$(VcpkgConfiguration)' == 'Debug'">$(VcpkgRoot)debug\lib\*.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies Condition="'$(VcpkgConfiguration)' == 'Release'">$(VcpkgRoot)lib\*.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(VCPkgRoot)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(VcpkgRoot)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
 
-  <Target Name="AppLocalFromInstalled" AfterTargets="CopyFilesToOutputDirectory" BeforeTargets="CopyLocalFilesOutputGroup" Condition="'$(VCPkgEnabled)' == 'true' and '$(OutputType)' == 'exe'">
+  <Target Name="AppLocalFromInstalled" AfterTargets="CopyFilesToOutputDirectory" BeforeTargets="CopyLocalFilesOutputGroup" Condition="'$(VcpkgEnabled)' == 'true' and '$(OutputType)' == 'exe'">
     <WriteLinesToFile
     File="$(TLogLocation)$(ProjectName).write.1u.tlog"
     Lines="^$(OutputPath)$(TargetName).$(OutputType);" Encoding="Unicode"/>
-    <Exec Condition="'$(VCPkgConfiguration)' == 'Debug'"
-      Command="powershell.exe -ExecutionPolicy Unrestricted -noprofile -File %22$(MSBuildThisFileDirectory)applocal.ps1%22 %22$(OutputPath)$(TargetName).$(OutputType)%22 %22$(VCPkgRoot)debug\bin%22 %22$(TLogLocation)$(ProjectName).write.1u.tlog%22"
+    <Exec Condition="'$(VcpkgConfiguration)' == 'Debug'"
+      Command="powershell.exe -ExecutionPolicy Unrestricted -noprofile -File %22$(MSBuildThisFileDirectory)applocal.ps1%22 %22$(OutputPath)$(TargetName).$(OutputType)%22 %22$(VcpkgRoot)debug\bin%22 %22$(TLogLocation)$(ProjectName).write.1u.tlog%22"
       ConsoleToMSBuild="true">
         <Output TaskParameter="ConsoleOutput" ItemName="ReferenceCopyLocalPaths" />
     </Exec>
-    <Exec Condition="'$(VCPkgConfiguration)' == 'Release'"
-      Command="powershell.exe -ExecutionPolicy Unrestricted -noprofile -File %22$(MSBuildThisFileDirectory)applocal.ps1%22 %22$(OutputPath)$(TargetName).$(OutputType)%22 %22$(VCPkgRoot)bin%22 %22$(TLogLocation)$(ProjectName).write.1u.tlog%22"
+    <Exec Condition="'$(VcpkgConfiguration)' == 'Release'"
+      Command="powershell.exe -ExecutionPolicy Unrestricted -noprofile -File %22$(MSBuildThisFileDirectory)applocal.ps1%22 %22$(OutputPath)$(TargetName).$(OutputType)%22 %22$(VcpkgRoot)bin%22 %22$(TLogLocation)$(ProjectName).write.1u.tlog%22"
       ConsoleToMSBuild="true">
         <Output TaskParameter="ConsoleOutput" ItemName="ReferenceCopyLocalPaths" />
     </Exec>
-- 
cgit v1.2.3


From 0b54a01149a515e5603bb81d9d89ee9827b6c498 Mon Sep 17 00:00:00 2001
From: kumar8600 <kumar8600@gmail.com>
Date: Sun, 30 Oct 2016 18:46:24 +0900
Subject: Add cl.exe path based architecture detection for CMake toolchain

---
 scripts/buildsystems/vcpkg.cmake | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'scripts/buildsystems')

diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake
index 88acc8436..649e5967a 100644
--- a/scripts/buildsystems/vcpkg.cmake
+++ b/scripts/buildsystems/vcpkg.cmake
@@ -11,7 +11,14 @@ if(NOT VCPKG_TOOLCHAIN)
         elseif(CMAKE_GENERATOR MATCHES "^Visual Studio 14 2015 ARM$")
             set(_VCPKG_TARGET_TRIPLET_ARCH arm)
         else()
-            set(_VCPKG_TARGET_TRIPLET_ARCH x86)
+            find_program(_VCPKG_CL cl)
+            if(_VCPKG_CL MATCHES "amd64/cl.exe$")
+                set(_VCPKG_TARGET_TRIPLET_ARCH x64)
+            elseif(_VCPKG_CL MATCHES "arm/cl.exe$")
+                set(_VCPKG_TARGET_TRIPLET_ARCH arm)
+            else()
+                set(_VCPKG_TARGET_TRIPLET_ARCH x86)
+            endif()
         endif()
     endif()
 
-- 
cgit v1.2.3


From 956f3b110ba2826899c97ab28dafc04ca36b4b20 Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Mon, 31 Oct 2016 09:37:13 -0700
Subject: [vcpkg-cmake] Added slightly more error checking

---
 scripts/buildsystems/vcpkg.cmake | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'scripts/buildsystems')

diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake
index 649e5967a..590b4994a 100644
--- a/scripts/buildsystems/vcpkg.cmake
+++ b/scripts/buildsystems/vcpkg.cmake
@@ -10,14 +10,18 @@ if(NOT VCPKG_TOOLCHAIN)
             set(_VCPKG_TARGET_TRIPLET_ARCH x64)
         elseif(CMAKE_GENERATOR MATCHES "^Visual Studio 14 2015 ARM$")
             set(_VCPKG_TARGET_TRIPLET_ARCH arm)
+        elseif(CMAKE_GENERATOR MATCHES "^Visual Studio 14 2015$")
+            set(_VCPKG_TARGET_TRIPLET_ARCH x86)
         else()
             find_program(_VCPKG_CL cl)
             if(_VCPKG_CL MATCHES "amd64/cl.exe$")
                 set(_VCPKG_TARGET_TRIPLET_ARCH x64)
             elseif(_VCPKG_CL MATCHES "arm/cl.exe$")
                 set(_VCPKG_TARGET_TRIPLET_ARCH arm)
-            else()
+            elseif(_VCPKG_CL MATCHES "x86/cl.exe$")
                 set(_VCPKG_TARGET_TRIPLET_ARCH x86)
+            else()
+                message(FATAL_ERROR "Unable to determine target architecture.")
             endif()
         endif()
     endif()
-- 
cgit v1.2.3


From bf16c7f4cc6f51c5e920f16f5b7cdf92cfe4ea67 Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Mon, 31 Oct 2016 10:11:25 -0700
Subject: [vcpkg-cmake] Fix regression in Ninja generator support for x86.

---
 scripts/buildsystems/vcpkg.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts/buildsystems')

diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake
index 590b4994a..50b489b1a 100644
--- a/scripts/buildsystems/vcpkg.cmake
+++ b/scripts/buildsystems/vcpkg.cmake
@@ -18,7 +18,7 @@ if(NOT VCPKG_TOOLCHAIN)
                 set(_VCPKG_TARGET_TRIPLET_ARCH x64)
             elseif(_VCPKG_CL MATCHES "arm/cl.exe$")
                 set(_VCPKG_TARGET_TRIPLET_ARCH arm)
-            elseif(_VCPKG_CL MATCHES "x86/cl.exe$")
+            elseif(_VCPKG_CL MATCHES "bin/cl.exe$" OR _VCPKG_CL MATCHES "x86/cl.exe$")
                 set(_VCPKG_TARGET_TRIPLET_ARCH x86)
             else()
                 message(FATAL_ERROR "Unable to determine target architecture.")
-- 
cgit v1.2.3


From d58f0c6680b93833a9a1b653c422ba7d2bb00f5d Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Mon, 31 Oct 2016 13:32:58 -0700
Subject: [integration] Enable static lib integration. Also, detect .vcpkg-root

---
 scripts/buildsystems/msbuild/vcpkg.targets | 94 +++++++++++++++++-------------
 1 file changed, 54 insertions(+), 40 deletions(-)

(limited to 'scripts/buildsystems')

diff --git a/scripts/buildsystems/msbuild/vcpkg.targets b/scripts/buildsystems/msbuild/vcpkg.targets
index 0d89fedd3..a7abe5dba 100644
--- a/scripts/buildsystems/msbuild/vcpkg.targets
+++ b/scripts/buildsystems/msbuild/vcpkg.targets
@@ -1,44 +1,58 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(Platform)|$(ApplicationType)|$(ApplicationTypeRevision)' == 'Win32||'">
-    <VcpkgEnabled Condition="'$(VcpkgEnabled)' == ''">true</VcpkgEnabled>
-    <VcpkgTriplet Condition="'$(VcpkgTriplet)' == ''">x86-windows</VcpkgTriplet>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Platform)|$(ApplicationType)|$(ApplicationTypeRevision)' == 'Win32|Windows Store|10.0'">
-    <VcpkgEnabled Condition="'$(VcpkgEnabled)' == ''">true</VcpkgEnabled>
-    <VcpkgTriplet Condition="'$(VcpkgTriplet)' == ''">x86-uwp</VcpkgTriplet>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Platform)|$(ApplicationType)|$(ApplicationTypeRevision)' == 'x64||'">
-    <VcpkgEnabled Condition="'$(VcpkgEnabled)' == ''">true</VcpkgEnabled>
-    <VcpkgTriplet Condition="'$(VcpkgTriplet)' == ''">x64-windows</VcpkgTriplet>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Platform)|$(ApplicationType)|$(ApplicationTypeRevision)' == 'x64|Windows Store|10.0'">
-    <VcpkgEnabled Condition="'$(VcpkgEnabled)' == ''">true</VcpkgEnabled>
-    <VcpkgTriplet Condition="'$(VcpkgTriplet)' == ''">x64-uwp</VcpkgTriplet>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Platform)|$(ApplicationType)|$(ApplicationTypeRevision)' == 'arm|Windows Store|10.0'">
-    <VcpkgEnabled Condition="'$(VcpkgEnabled)' == ''">true</VcpkgEnabled>
-    <VcpkgTriplet Condition="'$(VcpkgTriplet)' == ''">arm-uwp</VcpkgTriplet>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(VcpkgEnabled)' == 'true'">
-    <VcpkgConfiguration Condition="'$(VcpkgConfiguration)' == ''">$(Configuration)</VcpkgConfiguration>
-    <!-- Expected to ..\..\..\ over scripts\buildsystems\msbuild -->
-    <VcpkgRoot Condition="'$(VcpkgRoot)' == ''">$(MSBuildThisFileDirectory)..\..\..\installed\$(VcpkgTriplet)\</VcpkgRoot>
-  </PropertyGroup>
-
-  <ItemDefinitionGroup Condition="'$(VcpkgEnabled)' == 'true'">
-    <Link>
-      <AdditionalDependencies Condition="'$(VcpkgConfiguration)' == 'Debug'">$(VcpkgRoot)debug\lib\*.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalDependencies Condition="'$(VcpkgConfiguration)' == 'Release'">$(VcpkgRoot)lib\*.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(VcpkgRoot)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
+
+ <Target Name="RuntimeLibraryAnalyze" BeforeTargets="GetClCommandLines;ClCompile">
+    <PropertyGroup>
+      <VcpkgRuntimeLibrary Condition="'%(ClCompile.RuntimeLibrary)' == ''"></VcpkgRuntimeLibrary>
+      <VcpkgRuntimeLibrary Condition="'%(ClCompile.RuntimeLibrary)' == 'MultiThreadedDebugDLL'"></VcpkgRuntimeLibrary>
+      <VcpkgRuntimeLibrary Condition="'%(ClCompile.RuntimeLibrary)' == 'MultiThreadedDebug'">-static</VcpkgRuntimeLibrary>
+      <VcpkgRuntimeLibrary Condition="'%(ClCompile.RuntimeLibrary)' == 'MultiThreadedDLL'"></VcpkgRuntimeLibrary>
+      <VcpkgRuntimeLibrary Condition="'%(ClCompile.RuntimeLibrary)' == 'MultiThreaded'">-static</VcpkgRuntimeLibrary>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(Platform)|$(ApplicationType)|$(ApplicationTypeRevision)' == 'Win32||'">
+      <VcpkgEnabled Condition="'$(VcpkgEnabled)' == ''">true</VcpkgEnabled>
+      <VcpkgTriplet Condition="'$(VcpkgTriplet)' == ''">x86-windows$(VcpkgRuntimeLibrary)</VcpkgTriplet>
+    </PropertyGroup>
+
+      <Message Text="BeforeCompile: RuntimeLibrary=[%(ClCompile.RuntimeLibrary)]" />
+
+    <PropertyGroup Condition="'$(Platform)|$(ApplicationType)|$(ApplicationTypeRevision)' == 'Win32|Windows Store|10.0'">
+      <VcpkgEnabled Condition="'$(VcpkgEnabled)' == ''">true</VcpkgEnabled>
+      <VcpkgTriplet Condition="'$(VcpkgTriplet)' == ''">x86-uwp$(VcpkgRuntimeLibrary)</VcpkgTriplet>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(Platform)|$(ApplicationType)|$(ApplicationTypeRevision)' == 'x64||'">
+      <VcpkgEnabled Condition="'$(VcpkgEnabled)' == ''">true</VcpkgEnabled>
+      <VcpkgTriplet Condition="'$(VcpkgTriplet)' == ''">x64-windows$(VcpkgRuntimeLibrary)</VcpkgTriplet>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(Platform)|$(ApplicationType)|$(ApplicationTypeRevision)' == 'x64|Windows Store|10.0'">
+      <VcpkgEnabled Condition="'$(VcpkgEnabled)' == ''">true</VcpkgEnabled>
+      <VcpkgTriplet Condition="'$(VcpkgTriplet)' == ''">x64-uwp$(VcpkgRuntimeLibrary)</VcpkgTriplet>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(Platform)|$(ApplicationType)|$(ApplicationTypeRevision)' == 'arm|Windows Store|10.0'">
+      <VcpkgEnabled Condition="'$(VcpkgEnabled)' == ''">true</VcpkgEnabled>
+      <VcpkgTriplet Condition="'$(VcpkgTriplet)' == ''">arm-uwp$(VcpkgRuntimeLibrary)</VcpkgTriplet>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(VcpkgEnabled)' == 'true'">
+      <VcpkgConfiguration Condition="'$(VcpkgConfiguration)' == ''">$(Configuration)</VcpkgConfiguration>
+      <VcpkgRoot Condition="'$(VcpkgRoot)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), .vcpkg-root))\installed\$(VcpkgTriplet)\</VcpkgRoot>
+    </PropertyGroup>
+
+      <Message Text="Selecting VcpkgTriplet: $(VcpkgTriplet)"/>
+      <Message Text="Selecting VcpkgRoot: $(VcpkgRoot)"/>
+    <ItemGroup Condition="'$(VcpkgEnabled)' == 'true'">
+      <Link>
+        <AdditionalDependencies Condition="'$(VcpkgConfiguration)' == 'Debug'">$(VcpkgRoot)debug\lib\*.lib;%(Link.AdditionalDependencies)</AdditionalDependencies>
+        <AdditionalDependencies Condition="'$(VcpkgConfiguration)' == 'Release'">$(VcpkgRoot)lib\*.lib;%(Link.AdditionalDependencies)</AdditionalDependencies>
+      </Link>
+      <ClCompile>
+        <AdditionalIncludeDirectories>$(VcpkgRoot)include;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      </ClCompile>
+    </ItemGroup>
+  </Target>
 
   <Target Name="AppLocalFromInstalled" AfterTargets="CopyFilesToOutputDirectory" BeforeTargets="CopyLocalFilesOutputGroup" Condition="'$(VcpkgEnabled)' == 'true' and '$(OutputType)' == 'exe'">
     <WriteLinesToFile
-- 
cgit v1.2.3


From 789855546ca26ae30398235d0b3ee2f9eb92c40a Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Mon, 31 Oct 2016 17:02:39 -0700
Subject: Fix issues with the integration file

---
 scripts/buildsystems/msbuild/vcpkg.targets | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

(limited to 'scripts/buildsystems')

diff --git a/scripts/buildsystems/msbuild/vcpkg.targets b/scripts/buildsystems/msbuild/vcpkg.targets
index a7abe5dba..e6a321ffd 100644
--- a/scripts/buildsystems/msbuild/vcpkg.targets
+++ b/scripts/buildsystems/msbuild/vcpkg.targets
@@ -1,6 +1,6 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
- <Target Name="RuntimeLibraryAnalyze" BeforeTargets="GetClCommandLines;ClCompile">
+ <Target Name="VcpkgCompileInputs" BeforeTargets="GetClCommandLines;ClCompile">
     <PropertyGroup>
       <VcpkgRuntimeLibrary Condition="'%(ClCompile.RuntimeLibrary)' == ''"></VcpkgRuntimeLibrary>
       <VcpkgRuntimeLibrary Condition="'%(ClCompile.RuntimeLibrary)' == 'MultiThreadedDebugDLL'"></VcpkgRuntimeLibrary>
@@ -44,16 +44,36 @@
       <Message Text="Selecting VcpkgTriplet: $(VcpkgTriplet)"/>
       <Message Text="Selecting VcpkgRoot: $(VcpkgRoot)"/>
     <ItemGroup Condition="'$(VcpkgEnabled)' == 'true'">
-      <Link>
-        <AdditionalDependencies Condition="'$(VcpkgConfiguration)' == 'Debug'">$(VcpkgRoot)debug\lib\*.lib;%(Link.AdditionalDependencies)</AdditionalDependencies>
-        <AdditionalDependencies Condition="'$(VcpkgConfiguration)' == 'Release'">$(VcpkgRoot)lib\*.lib;%(Link.AdditionalDependencies)</AdditionalDependencies>
-      </Link>
       <ClCompile>
         <AdditionalIncludeDirectories>$(VcpkgRoot)include;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       </ClCompile>
     </ItemGroup>
   </Target>
 
+  <Target Name="VcpkgLinkInputs" 
+      DependsOnTargets="ComputeRCGeneratedLinkInputs;
+                        ComputeManifestGeneratedLinkerInputs;
+                        ComputeCustomBuildOutput;
+                        ComputeCLGeneratedLinkInputs;
+                        ComputeLinkInputsFromProject;
+                        ComputeReferenceLinkInputs;" 
+      BeforeTargets="Link">
+    <Message Text="LinkInputs: @(Link)" />
+    <ItemGroup Condition="'$(VcpkgEnabled)' == 'true'">
+      <VcpkgLink Include="$(VcpkgRoot)debug\lib\*.lib" Condition="'$(VcpkgConfiguration)' == 'Debug'"/>
+      <VcpkgLink Include="$(VcpkgRoot)lib\*.lib" Condition="'$(VcpkgConfiguration)' == 'Release'"/>
+
+      <Link>
+        <AdditionalDependencies>@(VcpkgLink);%(Link.AdditionalDependencies)</AdditionalDependencies>
+      </Link>
+    </ItemGroup>
+    <Message Text="VcpkgLinkInputs: @(VcpkgLink)" />
+  </Target>
+
+  <PropertyGroup>
+    <ComputeLinkInputsTargets >$(ComputeLinkInputsTargets);VcpkgLinkInputs</ComputeLinkInputsTargets >
+  </PropertyGroup>
+
   <Target Name="AppLocalFromInstalled" AfterTargets="CopyFilesToOutputDirectory" BeforeTargets="CopyLocalFilesOutputGroup" Condition="'$(VcpkgEnabled)' == 'true' and '$(OutputType)' == 'exe'">
     <WriteLinesToFile
     File="$(TLogLocation)$(ProjectName).write.1u.tlog"
-- 
cgit v1.2.3


From b25c13c1551456dc89ca959c7133b1cc6117532e Mon Sep 17 00:00:00 2001
From: Charles Barto <bartoc@umich.edu>
Date: Tue, 1 Nov 2016 19:19:05 -0400
Subject: made some qt5 fixes

---
 scripts/buildsystems/vcpkg.cmake | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'scripts/buildsystems')

diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake
index 88acc8436..4f6805457 100644
--- a/scripts/buildsystems/vcpkg.cmake
+++ b/scripts/buildsystems/vcpkg.cmake
@@ -42,12 +42,14 @@ if(NOT VCPKG_TOOLCHAIN)
     if(OVERRIDE_ADD_EXECUTABLE)
         function(add_executable name)
             _add_executable(${ARGV})
+            if(NOT "IMPORTED" IN_LIST ARGV)
             add_custom_command(TARGET ${name} POST_BUILD
                 COMMAND powershell -noprofile -executionpolicy UnRestricted -file ${_VCPKG_TOOLCHAIN_DIR}/msbuild/applocal.ps1
                     -targetBinary $<TARGET_FILE:${name}>
                     -installedDir "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$<CONFIG:Debug>:/debug>/bin"
                     -OutVariable out
             )
+            endif()
         endfunction()
     endif()
     set(VCPKG_TOOLCHAIN ON)
-- 
cgit v1.2.3


From e5152851f2bb070eb4bcc2b8968d40d48226b04e Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Fri, 4 Nov 2016 17:37:58 -0700
Subject: Revert d58f0c6680. MSBuild (and CMake) do not allow switching on CRT
 type effectively, so we should use more robust logic.

---
 scripts/buildsystems/msbuild/vcpkg.targets | 101 ++++++++++-------------------
 1 file changed, 33 insertions(+), 68 deletions(-)

(limited to 'scripts/buildsystems')

diff --git a/scripts/buildsystems/msbuild/vcpkg.targets b/scripts/buildsystems/msbuild/vcpkg.targets
index e6a321ffd..18c4e9d9f 100644
--- a/scripts/buildsystems/msbuild/vcpkg.targets
+++ b/scripts/buildsystems/msbuild/vcpkg.targets
@@ -1,79 +1,44 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(Platform)|$(ApplicationType)|$(ApplicationTypeRevision)' == 'Win32||'">
+    <VcpkgEnabled Condition="'$(VcpkgEnabled)' == ''">true</VcpkgEnabled>
+    <VcpkgTriplet Condition="'$(VcpkgTriplet)' == ''">x86-windows</VcpkgTriplet>
+  </PropertyGroup>
 
- <Target Name="VcpkgCompileInputs" BeforeTargets="GetClCommandLines;ClCompile">
-    <PropertyGroup>
-      <VcpkgRuntimeLibrary Condition="'%(ClCompile.RuntimeLibrary)' == ''"></VcpkgRuntimeLibrary>
-      <VcpkgRuntimeLibrary Condition="'%(ClCompile.RuntimeLibrary)' == 'MultiThreadedDebugDLL'"></VcpkgRuntimeLibrary>
-      <VcpkgRuntimeLibrary Condition="'%(ClCompile.RuntimeLibrary)' == 'MultiThreadedDebug'">-static</VcpkgRuntimeLibrary>
-      <VcpkgRuntimeLibrary Condition="'%(ClCompile.RuntimeLibrary)' == 'MultiThreadedDLL'"></VcpkgRuntimeLibrary>
-      <VcpkgRuntimeLibrary Condition="'%(ClCompile.RuntimeLibrary)' == 'MultiThreaded'">-static</VcpkgRuntimeLibrary>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(Platform)|$(ApplicationType)|$(ApplicationTypeRevision)' == 'Win32||'">
-      <VcpkgEnabled Condition="'$(VcpkgEnabled)' == ''">true</VcpkgEnabled>
-      <VcpkgTriplet Condition="'$(VcpkgTriplet)' == ''">x86-windows$(VcpkgRuntimeLibrary)</VcpkgTriplet>
-    </PropertyGroup>
-
-      <Message Text="BeforeCompile: RuntimeLibrary=[%(ClCompile.RuntimeLibrary)]" />
-
-    <PropertyGroup Condition="'$(Platform)|$(ApplicationType)|$(ApplicationTypeRevision)' == 'Win32|Windows Store|10.0'">
-      <VcpkgEnabled Condition="'$(VcpkgEnabled)' == ''">true</VcpkgEnabled>
-      <VcpkgTriplet Condition="'$(VcpkgTriplet)' == ''">x86-uwp$(VcpkgRuntimeLibrary)</VcpkgTriplet>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(Platform)|$(ApplicationType)|$(ApplicationTypeRevision)' == 'x64||'">
-      <VcpkgEnabled Condition="'$(VcpkgEnabled)' == ''">true</VcpkgEnabled>
-      <VcpkgTriplet Condition="'$(VcpkgTriplet)' == ''">x64-windows$(VcpkgRuntimeLibrary)</VcpkgTriplet>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(Platform)|$(ApplicationType)|$(ApplicationTypeRevision)' == 'x64|Windows Store|10.0'">
-      <VcpkgEnabled Condition="'$(VcpkgEnabled)' == ''">true</VcpkgEnabled>
-      <VcpkgTriplet Condition="'$(VcpkgTriplet)' == ''">x64-uwp$(VcpkgRuntimeLibrary)</VcpkgTriplet>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(Platform)|$(ApplicationType)|$(ApplicationTypeRevision)' == 'arm|Windows Store|10.0'">
-      <VcpkgEnabled Condition="'$(VcpkgEnabled)' == ''">true</VcpkgEnabled>
-      <VcpkgTriplet Condition="'$(VcpkgTriplet)' == ''">arm-uwp$(VcpkgRuntimeLibrary)</VcpkgTriplet>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(VcpkgEnabled)' == 'true'">
-      <VcpkgConfiguration Condition="'$(VcpkgConfiguration)' == ''">$(Configuration)</VcpkgConfiguration>
-      <VcpkgRoot Condition="'$(VcpkgRoot)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), .vcpkg-root))\installed\$(VcpkgTriplet)\</VcpkgRoot>
-    </PropertyGroup>
+  <PropertyGroup Condition="'$(Platform)|$(ApplicationType)|$(ApplicationTypeRevision)' == 'Win32|Windows Store|10.0'">
+    <VcpkgEnabled Condition="'$(VcpkgEnabled)' == ''">true</VcpkgEnabled>
+    <VcpkgTriplet Condition="'$(VcpkgTriplet)' == ''">x86-uwp</VcpkgTriplet>
+  </PropertyGroup>
 
-      <Message Text="Selecting VcpkgTriplet: $(VcpkgTriplet)"/>
-      <Message Text="Selecting VcpkgRoot: $(VcpkgRoot)"/>
-    <ItemGroup Condition="'$(VcpkgEnabled)' == 'true'">
-      <ClCompile>
-        <AdditionalIncludeDirectories>$(VcpkgRoot)include;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      </ClCompile>
-    </ItemGroup>
-  </Target>
+  <PropertyGroup Condition="'$(Platform)|$(ApplicationType)|$(ApplicationTypeRevision)' == 'x64||'">
+    <VcpkgEnabled Condition="'$(VcpkgEnabled)' == ''">true</VcpkgEnabled>
+    <VcpkgTriplet Condition="'$(VcpkgTriplet)' == ''">x64-windows</VcpkgTriplet>
+  </PropertyGroup>
 
-  <Target Name="VcpkgLinkInputs" 
-      DependsOnTargets="ComputeRCGeneratedLinkInputs;
-                        ComputeManifestGeneratedLinkerInputs;
-                        ComputeCustomBuildOutput;
-                        ComputeCLGeneratedLinkInputs;
-                        ComputeLinkInputsFromProject;
-                        ComputeReferenceLinkInputs;" 
-      BeforeTargets="Link">
-    <Message Text="LinkInputs: @(Link)" />
-    <ItemGroup Condition="'$(VcpkgEnabled)' == 'true'">
-      <VcpkgLink Include="$(VcpkgRoot)debug\lib\*.lib" Condition="'$(VcpkgConfiguration)' == 'Debug'"/>
-      <VcpkgLink Include="$(VcpkgRoot)lib\*.lib" Condition="'$(VcpkgConfiguration)' == 'Release'"/>
+  <PropertyGroup Condition="'$(Platform)|$(ApplicationType)|$(ApplicationTypeRevision)' == 'x64|Windows Store|10.0'">
+    <VcpkgEnabled Condition="'$(VcpkgEnabled)' == ''">true</VcpkgEnabled>
+    <VcpkgTriplet Condition="'$(VcpkgTriplet)' == ''">x64-uwp</VcpkgTriplet>
+  </PropertyGroup>
 
-      <Link>
-        <AdditionalDependencies>@(VcpkgLink);%(Link.AdditionalDependencies)</AdditionalDependencies>
-      </Link>
-    </ItemGroup>
-    <Message Text="VcpkgLinkInputs: @(VcpkgLink)" />
-  </Target>
+  <PropertyGroup Condition="'$(Platform)|$(ApplicationType)|$(ApplicationTypeRevision)' == 'arm|Windows Store|10.0'">
+    <VcpkgEnabled Condition="'$(VcpkgEnabled)' == ''">true</VcpkgEnabled>
+    <VcpkgTriplet Condition="'$(VcpkgTriplet)' == ''">arm-uwp</VcpkgTriplet>
+  </PropertyGroup>
 
-  <PropertyGroup>
-    <ComputeLinkInputsTargets >$(ComputeLinkInputsTargets);VcpkgLinkInputs</ComputeLinkInputsTargets >
+  <PropertyGroup Condition="'$(VcpkgEnabled)' == 'true'">
+    <VcpkgConfiguration Condition="'$(VcpkgConfiguration)' == ''">$(Configuration)</VcpkgConfiguration>
+    <VcpkgRoot Condition="'$(VcpkgRoot)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), .vcpkg-root))\installed\$(VcpkgTriplet)\</VcpkgRoot>
   </PropertyGroup>
 
+  <ItemDefinitionGroup Condition="'$(VcpkgEnabled)' == 'true'">
+    <Link>
+      <AdditionalDependencies Condition="'$(VcpkgConfiguration)' == 'Debug'">$(VcpkgRoot)debug\lib\*.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies Condition="'$(VcpkgConfiguration)' == 'Release'">$(VcpkgRoot)lib\*.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(VcpkgRoot)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+
   <Target Name="AppLocalFromInstalled" AfterTargets="CopyFilesToOutputDirectory" BeforeTargets="CopyLocalFilesOutputGroup" Condition="'$(VcpkgEnabled)' == 'true' and '$(OutputType)' == 'exe'">
     <WriteLinesToFile
     File="$(TLogLocation)$(ProjectName).write.1u.tlog"
-- 
cgit v1.2.3


From 097626c317bdf3efa16073c19aac4d0c226bb1ee Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Tue, 8 Nov 2016 19:02:59 -0800
Subject: Use /DEPENDENTS instead of /IMPORTS in applocal.ps1

---
 scripts/buildsystems/msbuild/applocal.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts/buildsystems')

diff --git a/scripts/buildsystems/msbuild/applocal.ps1 b/scripts/buildsystems/msbuild/applocal.ps1
index 70528e078..ddb4a07f9 100644
--- a/scripts/buildsystems/msbuild/applocal.ps1
+++ b/scripts/buildsystems/msbuild/applocal.ps1
@@ -5,7 +5,7 @@ function resolve($targetBinary) {
     $targetBinaryPath = Resolve-Path $targetBinary
     $targetBinaryDir = Split-Path $targetBinaryPath -parent
 
-    $a = $(link /dump /imports $targetBinary | ? { $_ -match "^    [^ ].*\.dll" } | % { $_ -replace "^    ","" })
+    $a = $(dumpbin /DEPENDENTS $targetBinary | ? { $_ -match "^    [^ ].*\.dll" } | % { $_ -replace "^    ","" })
     $a | % {
         if (Test-Path "$installedDir\$_") {
             if (Test-Path "$targetBinaryDir\$_") {
-- 
cgit v1.2.3


From 637dac384c66096ae9b4f2b0b78abd22edb338e3 Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Fri, 11 Nov 2016 16:17:39 -0800
Subject: [vcpkg-cmake-toolchain] Avoid IN_LIST to reduce required cmake
 version

---
 scripts/buildsystems/vcpkg.cmake | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'scripts/buildsystems')

diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake
index 257007e45..6384de7d3 100644
--- a/scripts/buildsystems/vcpkg.cmake
+++ b/scripts/buildsystems/vcpkg.cmake
@@ -53,13 +53,14 @@ if(NOT VCPKG_TOOLCHAIN)
     if(OVERRIDE_ADD_EXECUTABLE)
         function(add_executable name)
             _add_executable(${ARGV})
-            if(NOT "IMPORTED" IN_LIST ARGV)
-            add_custom_command(TARGET ${name} POST_BUILD
-                COMMAND powershell -noprofile -executionpolicy UnRestricted -file ${_VCPKG_TOOLCHAIN_DIR}/msbuild/applocal.ps1
-                    -targetBinary $<TARGET_FILE:${name}>
-                    -installedDir "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$<CONFIG:Debug>:/debug>/bin"
-                    -OutVariable out
-            )
+            list(FIND ARGV "IMPORTED" IMPORTED_IDX)
+            if(IMPORTED_IDX EQUAL -1)
+                add_custom_command(TARGET ${name} POST_BUILD
+                    COMMAND powershell -noprofile -executionpolicy UnRestricted -file ${_VCPKG_TOOLCHAIN_DIR}/msbuild/applocal.ps1
+                        -targetBinary $<TARGET_FILE:${name}>
+                        -installedDir "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$<CONFIG:Debug>:/debug>/bin"
+                        -OutVariable out
+                )
             endif()
         endfunction()
     endif()
-- 
cgit v1.2.3


From d56ab64fdeab2dee76710600d737cd86d31a00cf Mon Sep 17 00:00:00 2001
From: charlie barto <charlie barto>
Date: Wed, 16 Nov 2016 12:38:30 -0500
Subject: added x64 as a prefix to search for cl.exe in the toolchain file,
 this makes things work with VS '15' if you manually specify the triplet

---
 scripts/buildsystems/vcpkg.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts/buildsystems')

diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake
index 6384de7d3..aafeb531c 100644
--- a/scripts/buildsystems/vcpkg.cmake
+++ b/scripts/buildsystems/vcpkg.cmake
@@ -14,7 +14,7 @@ if(NOT VCPKG_TOOLCHAIN)
             set(_VCPKG_TARGET_TRIPLET_ARCH x86)
         else()
             find_program(_VCPKG_CL cl)
-            if(_VCPKG_CL MATCHES "amd64/cl.exe$")
+            if(_VCPKG_CL MATCHES "amd64/cl.exe$" OR _VCPKG_CL MATCHES "x64/cl.exe$")
                 set(_VCPKG_TARGET_TRIPLET_ARCH x64)
             elseif(_VCPKG_CL MATCHES "arm/cl.exe$")
                 set(_VCPKG_TARGET_TRIPLET_ARCH arm)
-- 
cgit v1.2.3


From 447160a19e8881d46b7e77ad8893f6445c3c74f2 Mon Sep 17 00:00:00 2001
From: Charlie Barto <bartoc@umich.edu>
Date: Sat, 19 Nov 2016 01:33:31 -0500
Subject: add support for VS 2017

---
 scripts/buildsystems/vcpkg.cmake | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'scripts/buildsystems')

diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake
index aafeb531c..54960a138 100644
--- a/scripts/buildsystems/vcpkg.cmake
+++ b/scripts/buildsystems/vcpkg.cmake
@@ -12,6 +12,12 @@ if(NOT VCPKG_TOOLCHAIN)
             set(_VCPKG_TARGET_TRIPLET_ARCH arm)
         elseif(CMAKE_GENERATOR MATCHES "^Visual Studio 14 2015$")
             set(_VCPKG_TARGET_TRIPLET_ARCH x86)
+        elseif(CMAKE_GENERATOR MATCHES "^Visual Studio 15 2017 Win64$")
+            set(_VCPKG_TARGET_TRIPLET_ARCH x64)
+        elseif(CMAKE_GENERATOR MATCHES "^Visual Studio 15 2017 ARM")
+            set(_VCPKG_TARGET_TRIPLET_ARCH arm)
+        elseif(CMAKE_GENERATOR MATCHES "^Visual Studio 15 2017")
+            set(_VCPKG_TARGET_TRIPLET_ARCH x86)
         else()
             find_program(_VCPKG_CL cl)
             if(_VCPKG_CL MATCHES "amd64/cl.exe$" OR _VCPKG_CL MATCHES "x64/cl.exe$")
-- 
cgit v1.2.3


From 32157f8ce5abdca2f25981064006906cd1cce5e5 Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Fri, 25 Nov 2016 23:10:27 -0800
Subject: [vcpkg-integrate] Provide an opt-out for autolinking. Properly
 suppress integration via MSBuild when using CMake.

Add lib\ and lib\manual-link\ to additional library paths.

[gtest] Because the four libraries provided by gtest supply redundant symbols and define main, opt them all out.

Addresses #306.
---
 scripts/buildsystems/msbuild/vcpkg.targets |  8 +++++---
 scripts/buildsystems/vcpkg.cmake           | 32 ++++++++++++++++++++++--------
 2 files changed, 29 insertions(+), 11 deletions(-)

(limited to 'scripts/buildsystems')

diff --git a/scripts/buildsystems/msbuild/vcpkg.targets b/scripts/buildsystems/msbuild/vcpkg.targets
index 18c4e9d9f..7782551c2 100644
--- a/scripts/buildsystems/msbuild/vcpkg.targets
+++ b/scripts/buildsystems/msbuild/vcpkg.targets
@@ -31,11 +31,13 @@
 
   <ItemDefinitionGroup Condition="'$(VcpkgEnabled)' == 'true'">
     <Link>
-      <AdditionalDependencies Condition="'$(VcpkgConfiguration)' == 'Debug'">$(VcpkgRoot)debug\lib\*.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalDependencies Condition="'$(VcpkgConfiguration)' == 'Release'">$(VcpkgRoot)lib\*.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies Condition="'$(VcpkgConfiguration)' == 'Debug' and '$(VcpkgAutoLink)' != 'false'">%(AdditionalDependencies);$(VcpkgRoot)debug\lib\*.lib</AdditionalDependencies>
+      <AdditionalDependencies Condition="'$(VcpkgConfiguration)' == 'Release' and '$(VcpkgAutoLink)' != 'false'">%(AdditionalDependencies);$(VcpkgRoot)lib\*.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories Condition="'$(VcpkgConfiguration)' == 'Release'">%(AdditionalLibraryDirectories);$(VcpkgRoot)lib;$(VcpkgRoot)lib\manual-link</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories Condition="'$(VcpkgConfiguration)' == 'Debug'">%(AdditionalLibraryDirectories);$(VcpkgRoot)debug\lib;$(VcpkgRoot)debug\lib\manual-link</AdditionalLibraryDirectories>
     </Link>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(VcpkgRoot)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(VcpkgRoot)include</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
 
diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake
index 54960a138..c77aca52d 100644
--- a/scripts/buildsystems/vcpkg.cmake
+++ b/scripts/buildsystems/vcpkg.cmake
@@ -46,21 +46,27 @@ if(NOT VCPKG_TOOLCHAIN)
         list(APPEND CMAKE_PREFIX_PATH
             ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug
         )
+        list(APPEND CMAKE_LIBRARY_PATH
+            ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib/manual-link
+        )
     endif()
     list(APPEND CMAKE_PREFIX_PATH
         ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}
     )
+    list(APPEND CMAKE_LIBRARY_PATH
+        ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/manual-link
+    )
 
     include_directories(${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include)
 
     set(CMAKE_PROGRAM_PATH ${CMAKE_PROGRAM_PATH} ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/tools)
 
-    option(OVERRIDE_ADD_EXECUTABLE "Automatically copy dependencies into the output directory for executables." ON)
-    if(OVERRIDE_ADD_EXECUTABLE)
-        function(add_executable name)
-            _add_executable(${ARGV})
-            list(FIND ARGV "IMPORTED" IMPORTED_IDX)
-            if(IMPORTED_IDX EQUAL -1)
+    option(VCPKG_APPLOCAL_DEPS "Automatically copy dependencies into the output directory for executables." ON)
+    function(add_executable name)
+        _add_executable(${ARGV})
+        list(FIND ARGV "IMPORTED" IMPORTED_IDX)
+        if(IMPORTED_IDX EQUAL -1)
+            if(VCPKG_APPLOCAL_DEPS)
                 add_custom_command(TARGET ${name} POST_BUILD
                     COMMAND powershell -noprofile -executionpolicy UnRestricted -file ${_VCPKG_TOOLCHAIN_DIR}/msbuild/applocal.ps1
                         -targetBinary $<TARGET_FILE:${name}>
@@ -68,7 +74,17 @@ if(NOT VCPKG_TOOLCHAIN)
                         -OutVariable out
                 )
             endif()
-        endfunction()
-    endif()
+            set_target_properties(${name} PROPERTIES VS_GLOBAL_VcpkgEnabled false)
+        endif()
+    endfunction()
+
+    function(add_library name)
+        _add_library(${ARGV})
+        list(FIND ARGV "IMPORTED" IMPORTED_IDX)
+        if(IMPORTED_IDX EQUAL -1)
+            set_target_properties(${name} PROPERTIES VS_GLOBAL_VcpkgEnabled false)
+        endif()
+    endfunction()
+
     set(VCPKG_TOOLCHAIN ON)
 endif()
-- 
cgit v1.2.3


From 61b653aad37f4dbad0d64f7dca895ca94ccad983 Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Sat, 26 Nov 2016 00:10:42 -0800
Subject: [vcpkg.cmake] Add `lib` and `lib/manual-link` to CMake's default link
 directories when using our toolchain.

---
 scripts/buildsystems/vcpkg.cmake | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'scripts/buildsystems')

diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake
index c77aca52d..44db05a22 100644
--- a/scripts/buildsystems/vcpkg.cmake
+++ b/scripts/buildsystems/vcpkg.cmake
@@ -49,6 +49,7 @@ if(NOT VCPKG_TOOLCHAIN)
         list(APPEND CMAKE_LIBRARY_PATH
             ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib/manual-link
         )
+        link_directories(${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib/manual-link)
     endif()
     list(APPEND CMAKE_PREFIX_PATH
         ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}
@@ -56,6 +57,7 @@ if(NOT VCPKG_TOOLCHAIN)
     list(APPEND CMAKE_LIBRARY_PATH
         ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/manual-link
     )
+    link_directories(${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/manual-link)
 
     include_directories(${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include)
 
-- 
cgit v1.2.3


From f874d15ecabd7e7331e3da6bf03d7573fe48c6a4 Mon Sep 17 00:00:00 2001
From: Charlie Barto <bartoc@umich.edu>
Date: Fri, 2 Dec 2016 12:24:14 -0500
Subject: fixed vcpkg trying to set properties on INTERFACE and ALIAS targets

---
 scripts/buildsystems/vcpkg.cmake | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'scripts/buildsystems')

diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake
index 44db05a22..089d28db8 100644
--- a/scripts/buildsystems/vcpkg.cmake
+++ b/scripts/buildsystems/vcpkg.cmake
@@ -83,7 +83,9 @@ if(NOT VCPKG_TOOLCHAIN)
     function(add_library name)
         _add_library(${ARGV})
         list(FIND ARGV "IMPORTED" IMPORTED_IDX)
-        if(IMPORTED_IDX EQUAL -1)
+        list(FIND ARGV "INTERFACE" INTERFACE_IDX)
+        list(FIND ARGV "ALIAS" ALIAS_IDX)
+        if(IMPORTED_IDX EQUAL -1 AND INTERFACE_IDX EQUAL -1 AND ALIAS_IDX EQUAL -1)
             set_target_properties(${name} PROPERTIES VS_GLOBAL_VcpkgEnabled false)
         endif()
     endfunction()
-- 
cgit v1.2.3


From a710f67e5281480ab22d0ef372d376696f5fc8ab Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Sat, 3 Dec 2016 02:54:37 -0800
Subject: [vcpkg] Remove automatic include paths and link paths from CMake
 toolchain. It is customary to use find_X() in CMake, so automatic paths are
 not needed.

---
 scripts/buildsystems/vcpkg.cmake | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'scripts/buildsystems')

diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake
index 089d28db8..7be93e54d 100644
--- a/scripts/buildsystems/vcpkg.cmake
+++ b/scripts/buildsystems/vcpkg.cmake
@@ -49,7 +49,6 @@ if(NOT VCPKG_TOOLCHAIN)
         list(APPEND CMAKE_LIBRARY_PATH
             ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib/manual-link
         )
-        link_directories(${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib/manual-link)
     endif()
     list(APPEND CMAKE_PREFIX_PATH
         ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}
@@ -57,9 +56,6 @@ if(NOT VCPKG_TOOLCHAIN)
     list(APPEND CMAKE_LIBRARY_PATH
         ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/manual-link
     )
-    link_directories(${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/manual-link)
-
-    include_directories(${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include)
 
     set(CMAKE_PROGRAM_PATH ${CMAKE_PROGRAM_PATH} ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/tools)
 
-- 
cgit v1.2.3


From c0cb3ca00997207be8896475667bdca19938c925 Mon Sep 17 00:00:00 2001
From: Christian Ullrich <chris@chrullrich.net>
Date: Fri, 23 Dec 2016 11:14:17 +0100
Subject: Copy DLLs for all project types.

$(TargetPath) is a simpler way of getting the primary output than assembling it from multiple variables. In addition, $(OutputType) matches $(TargetExt) only for .exe projects.
---
 scripts/buildsystems/msbuild/vcpkg.targets | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'scripts/buildsystems')

diff --git a/scripts/buildsystems/msbuild/vcpkg.targets b/scripts/buildsystems/msbuild/vcpkg.targets
index 7782551c2..ddae84806 100644
--- a/scripts/buildsystems/msbuild/vcpkg.targets
+++ b/scripts/buildsystems/msbuild/vcpkg.targets
@@ -41,17 +41,17 @@
     </ClCompile>
   </ItemDefinitionGroup>
 
-  <Target Name="AppLocalFromInstalled" AfterTargets="CopyFilesToOutputDirectory" BeforeTargets="CopyLocalFilesOutputGroup" Condition="'$(VcpkgEnabled)' == 'true' and '$(OutputType)' == 'exe'">
+  <Target Name="AppLocalFromInstalled" AfterTargets="CopyFilesToOutputDirectory" BeforeTargets="CopyLocalFilesOutputGroup" Condition="'$(VcpkgEnabled)' == 'true'">
     <WriteLinesToFile
     File="$(TLogLocation)$(ProjectName).write.1u.tlog"
     Lines="^$(OutputPath)$(TargetName).$(OutputType);" Encoding="Unicode"/>
     <Exec Condition="'$(VcpkgConfiguration)' == 'Debug'"
-      Command="powershell.exe -ExecutionPolicy Unrestricted -noprofile -File %22$(MSBuildThisFileDirectory)applocal.ps1%22 %22$(OutputPath)$(TargetName).$(OutputType)%22 %22$(VcpkgRoot)debug\bin%22 %22$(TLogLocation)$(ProjectName).write.1u.tlog%22"
+      Command="powershell.exe -ExecutionPolicy Unrestricted -noprofile -File %22$(MSBuildThisFileDirectory)applocal.ps1%22 %22$(TargetPath)%22 %22$(VcpkgRoot)debug\bin%22 %22$(TLogLocation)$(ProjectName).write.1u.tlog%22"
       ConsoleToMSBuild="true">
         <Output TaskParameter="ConsoleOutput" ItemName="ReferenceCopyLocalPaths" />
     </Exec>
     <Exec Condition="'$(VcpkgConfiguration)' == 'Release'"
-      Command="powershell.exe -ExecutionPolicy Unrestricted -noprofile -File %22$(MSBuildThisFileDirectory)applocal.ps1%22 %22$(OutputPath)$(TargetName).$(OutputType)%22 %22$(VcpkgRoot)bin%22 %22$(TLogLocation)$(ProjectName).write.1u.tlog%22"
+      Command="powershell.exe -ExecutionPolicy Unrestricted -noprofile -File %22$(MSBuildThisFileDirectory)applocal.ps1%22 %22$(TargetPath)%22 %22$(VcpkgRoot)bin%22 %22$(TLogLocation)$(ProjectName).write.1u.tlog%22"
       ConsoleToMSBuild="true">
         <Output TaskParameter="ConsoleOutput" ItemName="ReferenceCopyLocalPaths" />
     </Exec>
-- 
cgit v1.2.3


From 335c15a9d05f6410d3df6133ffc60b04fdfbe20f Mon Sep 17 00:00:00 2001
From: Christian Ullrich <chris@chrullrich.net>
Date: Fri, 23 Dec 2016 14:45:29 +0100
Subject: Copy DLLs before attempting to regsvr32.

---
 scripts/buildsystems/msbuild/vcpkg.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts/buildsystems')

diff --git a/scripts/buildsystems/msbuild/vcpkg.targets b/scripts/buildsystems/msbuild/vcpkg.targets
index ddae84806..0c748c1d6 100644
--- a/scripts/buildsystems/msbuild/vcpkg.targets
+++ b/scripts/buildsystems/msbuild/vcpkg.targets
@@ -41,7 +41,7 @@
     </ClCompile>
   </ItemDefinitionGroup>
 
-  <Target Name="AppLocalFromInstalled" AfterTargets="CopyFilesToOutputDirectory" BeforeTargets="CopyLocalFilesOutputGroup" Condition="'$(VcpkgEnabled)' == 'true'">
+  <Target Name="AppLocalFromInstalled" AfterTargets="CopyFilesToOutputDirectory" BeforeTargets="CopyLocalFilesOutputGroup;RegisterOutput" Condition="'$(VcpkgEnabled)' == 'true'">
     <WriteLinesToFile
     File="$(TLogLocation)$(ProjectName).write.1u.tlog"
     Lines="^$(OutputPath)$(TargetName).$(OutputType);" Encoding="Unicode"/>
-- 
cgit v1.2.3


From da09df713fe7b68d432108802447eb534a7dd555 Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Fri, 13 Jan 2017 17:39:12 -0800
Subject: [vcpkg integration] Explicitly skip empty entries instead of
 recursing. Fixes #460.

---
 scripts/buildsystems/msbuild/applocal.ps1 | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'scripts/buildsystems')

diff --git a/scripts/buildsystems/msbuild/applocal.ps1 b/scripts/buildsystems/msbuild/applocal.ps1
index ddb4a07f9..46981fad5 100644
--- a/scripts/buildsystems/msbuild/applocal.ps1
+++ b/scripts/buildsystems/msbuild/applocal.ps1
@@ -7,6 +7,9 @@ function resolve($targetBinary) {
 
     $a = $(dumpbin /DEPENDENTS $targetBinary | ? { $_ -match "^    [^ ].*\.dll" } | % { $_ -replace "^    ","" })
     $a | % {
+        if ([string]::IsNullOrEmpty($_)) {
+            continue
+        }
         if (Test-Path "$installedDir\$_") {
             if (Test-Path "$targetBinaryDir\$_") {
                 Write-Verbose "$_ is already present"
-- 
cgit v1.2.3


From 030ed271179ac57479d4bfec2e64b9457486d4c5 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Thu, 19 Jan 2017 17:38:56 -0800
Subject: Fix integration when $(Platform) is empty

---
 scripts/buildsystems/msbuild/vcpkg.targets | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'scripts/buildsystems')

diff --git a/scripts/buildsystems/msbuild/vcpkg.targets b/scripts/buildsystems/msbuild/vcpkg.targets
index 0c748c1d6..912cf6b8e 100644
--- a/scripts/buildsystems/msbuild/vcpkg.targets
+++ b/scripts/buildsystems/msbuild/vcpkg.targets
@@ -9,6 +9,16 @@
     <VcpkgTriplet Condition="'$(VcpkgTriplet)' == ''">x86-uwp</VcpkgTriplet>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Platform)|$(ApplicationType)|$(ApplicationTypeRevision)' == '||'">
+    <VcpkgEnabled Condition="'$(VcpkgEnabled)' == ''">true</VcpkgEnabled>
+    <VcpkgTriplet Condition="'$(VcpkgTriplet)' == ''">x86-windows</VcpkgTriplet>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Platform)|$(ApplicationType)|$(ApplicationTypeRevision)' == '|Windows Store|10.0'">
+    <VcpkgEnabled Condition="'$(VcpkgEnabled)' == ''">true</VcpkgEnabled>
+    <VcpkgTriplet Condition="'$(VcpkgTriplet)' == ''">x86-uwp</VcpkgTriplet>
+  </PropertyGroup>
+
   <PropertyGroup Condition="'$(Platform)|$(ApplicationType)|$(ApplicationTypeRevision)' == 'x64||'">
     <VcpkgEnabled Condition="'$(VcpkgEnabled)' == ''">true</VcpkgEnabled>
     <VcpkgTriplet Condition="'$(VcpkgTriplet)' == ''">x64-windows</VcpkgTriplet>
-- 
cgit v1.2.3


From 44810f267d095986f519d8b41592e83e913c2e56 Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Mon, 23 Jan 2017 18:26:57 -0800
Subject: [vcpkg integrate] Lower verbosity of MSBuild messages.

---
 scripts/buildsystems/msbuild/vcpkg.targets | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'scripts/buildsystems')

diff --git a/scripts/buildsystems/msbuild/vcpkg.targets b/scripts/buildsystems/msbuild/vcpkg.targets
index 912cf6b8e..26a524ca3 100644
--- a/scripts/buildsystems/msbuild/vcpkg.targets
+++ b/scripts/buildsystems/msbuild/vcpkg.targets
@@ -57,12 +57,14 @@
     Lines="^$(OutputPath)$(TargetName).$(OutputType);" Encoding="Unicode"/>
     <Exec Condition="'$(VcpkgConfiguration)' == 'Debug'"
       Command="powershell.exe -ExecutionPolicy Unrestricted -noprofile -File %22$(MSBuildThisFileDirectory)applocal.ps1%22 %22$(TargetPath)%22 %22$(VcpkgRoot)debug\bin%22 %22$(TLogLocation)$(ProjectName).write.1u.tlog%22"
-      ConsoleToMSBuild="true">
+      ConsoleToMSBuild="true"
+      StandardOutputImportance="Normal">
         <Output TaskParameter="ConsoleOutput" ItemName="ReferenceCopyLocalPaths" />
     </Exec>
     <Exec Condition="'$(VcpkgConfiguration)' == 'Release'"
       Command="powershell.exe -ExecutionPolicy Unrestricted -noprofile -File %22$(MSBuildThisFileDirectory)applocal.ps1%22 %22$(TargetPath)%22 %22$(VcpkgRoot)bin%22 %22$(TLogLocation)$(ProjectName).write.1u.tlog%22"
-      ConsoleToMSBuild="true">
+      ConsoleToMSBuild="true"
+      StandardOutputImportance="Normal">
         <Output TaskParameter="ConsoleOutput" ItemName="ReferenceCopyLocalPaths" />
     </Exec>
   </Target>
-- 
cgit v1.2.3


From 33ce94a4565ce68cd02cacda221fccbd756d3949 Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Tue, 24 Jan 2017 15:17:45 -0800
Subject: [vcpkg integrate] Exit silently if target cannot be found.

---
 scripts/buildsystems/msbuild/applocal.ps1 | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'scripts/buildsystems')

diff --git a/scripts/buildsystems/msbuild/applocal.ps1 b/scripts/buildsystems/msbuild/applocal.ps1
index 46981fad5..55680c1f6 100644
--- a/scripts/buildsystems/msbuild/applocal.ps1
+++ b/scripts/buildsystems/msbuild/applocal.ps1
@@ -2,7 +2,14 @@
 param([string]$targetBinary, [string]$installedDir, [string]$tlogFile)
 
 function resolve($targetBinary) {
-    $targetBinaryPath = Resolve-Path $targetBinary
+    try
+    {
+        $targetBinaryPath = Resolve-Path $targetBinary -erroraction stop
+    }
+    catch [System.Management.Automation.ItemNotFoundException]
+    {
+        return
+    }
     $targetBinaryDir = Split-Path $targetBinaryPath -parent
 
     $a = $(dumpbin /DEPENDENTS $targetBinary | ? { $_ -match "^    [^ ].*\.dll" } | % { $_ -replace "^    ","" })
-- 
cgit v1.2.3


From 8b219333675e42edf21f6c528fe7760d6d465460 Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Tue, 31 Jan 2017 17:53:08 -0800
Subject: [vcpkg-msbuild] Add troubleshooting message to MSBuild projects with
 Importance=Normal

---
 scripts/buildsystems/msbuild/vcpkg.targets | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'scripts/buildsystems')

diff --git a/scripts/buildsystems/msbuild/vcpkg.targets b/scripts/buildsystems/msbuild/vcpkg.targets
index 26a524ca3..d1d804e94 100644
--- a/scripts/buildsystems/msbuild/vcpkg.targets
+++ b/scripts/buildsystems/msbuild/vcpkg.targets
@@ -51,6 +51,11 @@
     </ClCompile>
   </ItemDefinitionGroup>
 
+  <Target Name="VcpkgTripletSelection" BeforeTargets="ClCompile">
+    <Message Text="Using triplet &quot;$(VcpkgTriplet)&quot; from &quot;$(VcpkgRoot)&quot;" Importance="Normal" Condition="'$(VcpkgEnabled)' == 'true'"/>
+    <Message Text="Not using Vcpkg because VcpkgEnabled is &quot;$(VcpkgEnabled)&quot;" Importance="Normal" Condition="'$(VcpkgEnabled)' != 'true'"/>
+  </Target>
+
   <Target Name="AppLocalFromInstalled" AfterTargets="CopyFilesToOutputDirectory" BeforeTargets="CopyLocalFilesOutputGroup;RegisterOutput" Condition="'$(VcpkgEnabled)' == 'true'">
     <WriteLinesToFile
     File="$(TLogLocation)$(ProjectName).write.1u.tlog"
-- 
cgit v1.2.3


From b2b2c9136918ed3ef85961c5c2885b9562d07d1d Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Thu, 2 Feb 2017 15:41:20 -0800
Subject: [vcpkg] Override Boost_COMPILER setting for all packages and
 toolchain to enable mixing VS2015 and VS2017

---
 scripts/buildsystems/vcpkg.cmake | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'scripts/buildsystems')

diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake
index 7be93e54d..e7b2b20db 100644
--- a/scripts/buildsystems/vcpkg.cmake
+++ b/scripts/buildsystems/vcpkg.cmake
@@ -57,6 +57,8 @@ if(NOT VCPKG_TOOLCHAIN)
         ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/manual-link
     )
 
+    set(Boost_COMPILER "-vc140")
+
     set(CMAKE_PROGRAM_PATH ${CMAKE_PROGRAM_PATH} ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/tools)
 
     option(VCPKG_APPLOCAL_DEPS "Automatically copy dependencies into the output directory for executables." ON)
-- 
cgit v1.2.3