Skip to contentSkip to conversation

Reference msvc-generate from compat to assure correct build order

PATCH In review Simon Rozman 3 participants 3 messages Oct 8, 2018

lore
Share & tools
lore

Simon Rozman

author
#0 lore raw

PATCH 1/1 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.

---
 src/compat/compat.vcxproj | 6 ++++++
 1 file changed, 6 insertions(+)
src/compat/compat.vcxproj +6 -0
index 07d6baf1..d6473581 100644
@@ -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>
Signature · 1 line
2.19.0.windows.1
Acked-by on v1 1/1
#1 lore raw
Acked-by Lev Stipakov <[email protected]...>

ma 8. lokak. 2018 klo 13.05 Simon Rozman ([email protected]...) kirjoitti:

Quoted 38 lines

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.

---
 src/compat/compat.vcxproj | 6 ++++++
 1 file changed, 6 insertions(+)
src/compat/compat.vcxproj +2 -0
index 07d6baf1..d6473581 100644
@@ -143,6 +143,12 @@
   <ItemGroup>
     <ClInclude Include="compat.h" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference

Include="..\..\build\msvc\msvc-generate\msvc-generate.vcxproj">

src/compat/compat.vcxproj +4 -1
+      <Project>{8598c2c8-34c4-47a1-99b0-7c295a890615}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
--

2.19.0.windows.1

_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel

Signature · 1 line
-Lev
#2 lore raw
In reply to Simon Rozman

"The XML looks reasonable and it does not affect anything else" :-)

Your patch has been applied to the master branch.

commit 354dd0e04228b813a1753da0f38836198c09f68b

Author: Simon Rozman
Date:   Mon Oct 8 12:03:23 2018 +0200
     Reference msvc-generate from compat to assure correct build order

     Acked-by: Lev Stipakov <[email protected]...>
     Message-Id: <[email protected]...>
     URL: https://www.mail-archive.com/[email protected]/msg17635.html
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering