From: Simon Rozman <simon@rozman.si>
Date: Mon, 8 Oct 2018 10:03:23 +0000 (+0200)
Subject: Reference msvc-generate from compat to assure correct build order
X-Git-Tag: v2.5_beta1~416
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=354dd0e04228b813a1753da0f38836198c09f68b;p=thirdparty%2Fopenvpn.git

Reference msvc-generate from compat to assure correct build order

Single-process builds start building compat project first and they fail,
since the referenced config-msvc-version.h is not available yet. Multi-
process rebuilds also tends to fail if the compat project is built
faster than msvc-generate is able to produce the required output files.

Adding a reference to msvc-generate project assures correct build order.
Acked-by: Lev Stipakov <lstipakov@gmail.com>
Message-Id: <20181008100323.11308-1-simon@rozman.si>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg17635.html

Signed-off-by: Gert Doering <gert@greenie.muc.de>
---

diff --git a/src/compat/compat.vcxproj b/src/compat/compat.vcxproj
index 07d6baf1c..d64735813 100644
--- a/src/compat/compat.vcxproj
+++ b/src/compat/compat.vcxproj
@@ -143,6 +143,12 @@
   <ItemGroup>
     <ClInclude Include="compat.h" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\build\msvc\msvc-generate\msvc-generate.vcxproj">
+      <Project>{8598c2c8-34c4-47a1-99b0-7c295a890615}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>