if Win64 is at the end of the generator, use platform x64 (#4025)

microsoft · Aug 30, 2024 · 4a334a6 · 4a334a6
1 parent f1a3770
commit 4a334a6
Showing 1 changed file with 5 additions and 1 deletion.
diff --git 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
                     };
                 }