Skip to content

Commit 4a334a6

Browse files
if Win64 is at the end of the generator, use platform x64 (#4025)
1 parent f1a3770 commit 4a334a6

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

src/drivers/cmakeDriver.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1006,9 +1006,13 @@ export abstract class CMakeDriver implements vscode.Disposable {
10061006
if (!generator_present) {
10071007
const vsMatch = /^(Visual Studio \d{2} \d{4})($|\sWin64$|\sARM$)/.exec(gen.name);
10081008
if (platform === 'win32' && vsMatch) {
1009+
let possibleArchitecture = vsMatch[2].trim();
1010+
if (possibleArchitecture && possibleArchitecture === "Win64") {
1011+
possibleArchitecture = "x64";
1012+
}
10091013
return {
10101014
name: vsMatch[1],
1011-
platform: gen.platform || vsMatch[2],
1015+
platform: gen.platform || possibleArchitecture,
10121016
toolset: gen.toolset
10131017
};
10141018
}

0 commit comments

Comments
 (0)