From 7018deb7f8bc22bdbab7be29896c92ec648a3f2f Mon Sep 17 00:00:00 2001
From: Callum Linden <callum@lindenlab.com>
Date: Mon, 3 Oct 2022 11:31:44 -0700
Subject: [PATCH] SL-18289: Modify autobuild.xml to insert a CMaker
architecture flag as well as the generator string for Windows builds
---
autobuild.xml | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/autobuild.xml b/autobuild.xml
index 985bb55902e..96f6918a990 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -3235,6 +3235,8 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<array>
<string>-G</string>
<string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
+ <string>-A</string>
+ <string>${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
</array>
</map>
<key>default</key>
@@ -3273,6 +3275,8 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<array>
<string>-G</string>
<string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
+ <string>-A</string>
+ <string>${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
<string>-DINSTALL_PROPRIETARY=FALSE</string>
<string>-DUSE_KDU=FALSE</string>
<string>-DUSE_OPENAL:BOOL=ON</string>
@@ -3307,6 +3311,8 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<array>
<string>-G</string>
<string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
+ <string>-A</string>
+ <string>${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
</array>
</map>
<key>name</key>
@@ -3343,6 +3349,8 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<array>
<string>-G</string>
<string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
+ <string>-A</string>
+ <string>${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
<string>-DUNATTENDED:BOOL=ON</string>
<string>-DINSTALL_PROPRIETARY=FALSE</string>
<string>-DUSE_KDU=FALSE</string>
--
GitLab