From 773b60c36c71e27d96d379872bd334ca1749ef71 Mon Sep 17 00:00:00 2001
From: Niels Martin Hansen <nielsm@indvikleren.dk>
Date: Sun, 18 Jan 2015 03:47:58 +0100
Subject: [PATCH] Rework header copy in boost build

---
 build/boost/boost.vcxproj | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/build/boost/boost.vcxproj b/build/boost/boost.vcxproj
index 955d8f13e..fff93799e 100644
--- a/build/boost/boost.vcxproj
+++ b/build/boost/boost.vcxproj
@@ -28,7 +28,20 @@
     </ClCompile>
   </ItemDefinitionGroup>
 
-  <Target Name="CopyHeaders" BeforeTargets="ClCompile">
+  <PropertyGroup>
+    <BuildGenerateSourcesTargets>
+      $(BuildGenerateSourcesTargets);
+      CopyBoostHeaders
+    </BuildGenerateSourcesTargets>
+  </PropertyGroup>
+  <!-- Have the target depend on the boost version.hpp file so it will usually
+       be skipped if the boost version hasn't changed since last build. -->
+  <Target
+    Name="CopyBoostHeaders"
+    Inputs="$(BoostPath)\libs\config\include\boost\version.hpp"
+    Outputs="$(AegisubSourceBase)include\boost\version.hpp"
+    >
+    <Message Importance="High" Text="Copy boost headers" />
     <!-- All this cruft is to work around that despite what the documentation
          claims, %(RecursiveDir) matches everything from the first * (not even
          **) until the last / -->
@@ -36,7 +49,7 @@
       <BoostLibraries Include="$([System.IO.Directory]::GetDirectories(&quot;$(BoostPath)\libs&quot;))" />
       <BoostIncludeDirs Include="%(BoostLibraries.Identity)\include\boost;$(BoostPath)\libs\numeric\conversion\include\boost" />
       <Headers Include="%(BoostIncludeDirs.Identity)\**\*.*" />
-   </ItemGroup>
+    </ItemGroup>
     <Copy
       SourceFiles="@(Headers)"
       DestinationFiles="@(Headers->'$(AegisubSourceBase)include\boost\%(RecursiveDir)%(Filename)%(Extension)')"