From 4a334a60ce5aa2e1d2e7a3d1e6b11420048ec295 Mon Sep 17 00:00:00 2001
From: Garrett Campbell <86264750+gcampbell-msft@users.noreply.github.com>
Date: Fri, 30 Aug 2024 11:44:56 -0400
Subject: [PATCH] if Win64 is at the end of the generator, use platform x64
 (#4025)

---
 src/drivers/cmakeDriver.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/drivers/cmakeDriver.ts b/src/drivers/cmakeDriver.ts
index 73a91c80..7c1b01f3 100644
--- a/src/drivers/cmakeDriver.ts
+++ b/src/drivers/cmakeDriver.ts
@@ -1006,9 +1006,13 @@ export abstract class CMakeDriver implements vscode.Disposable {
             if (!generator_present) {
                 const vsMatch = /^(Visual Studio \d{2} \d{4})($|\sWin64$|\sARM$)/.exec(gen.name);
                 if (platform === 'win32' && vsMatch) {
+                    let possibleArchitecture = vsMatch[2].trim();
+                    if (possibleArchitecture && possibleArchitecture === "Win64") {
+                        possibleArchitecture = "x64";
+                    }
                     return {
                         name: vsMatch[1],
-                        platform: gen.platform || vsMatch[2],
+                        platform: gen.platform || possibleArchitecture,
                         toolset: gen.toolset
                     };
                 }