Correct usage of toolset and architecture when no configurepreset.generator is defined in the preset.

CHANGELOG.md

@@ -29,6 +29,7 @@ Bug Fixes:
 - Ensure that tests are updated after a build. [#4148](https://github.com/microsoft/vscode-cmake-tools/pull/4148)
 - Fix various GCC compiler errors and GCC linker errors not showing up in Problems View [#2864](https://github.com/microsoft/vscode-cmake-tools/issues/2864)
 - Fix reloading presets when included files are changed or renamed and updated. [#3963](https://github.com/microsoft/vscode-cmake-tools/issues/3963)
+- Fix the usage of toolset and archiecture in presets without generator set. [#4181](https://github.com/microsoft/vscode-cmake-tools/issues/4181)
 
 ## 1.19.52
 

src/drivers/cmakeDriver.ts

@@ -390,6 +390,14 @@ export abstract class CMakeDriver implements vscode.Disposable {
         return this._useCMakePresets;
     }
 
+    get configurePresetArchitecture(): string | preset.ValueStrategy | undefined {
+        return this._configurePreset?.architecture;
+    }
+
+    get configurePresetToolset(): string | preset.ValueStrategy | undefined {
+        return this._configurePreset?.toolset;
+    }
+
     private _configurePreset: preset.ConfigurePreset | null = null;
 
     private _buildPreset: preset.BuildPreset | null = null;

src/drivers/cmakeFileApiDriver.ts

@@ -32,6 +32,7 @@
 import { CMakeOutputConsumer, StateMessage } from '@cmt/diagnostics/cmake';
 import { ConfigureTrigger } from '@cmt/cmakeProject';
 import { onConfigureSettingsChange } from '@cmt/ui/util';
+import { targetArchFromGeneratorPlatform } from '@cmt/installs/visualStudio';
 
 nls.config({ messageFormat: nls.MessageFormat.bundle, bundleFormat: nls.BundleFormat.standalone })();
 const localize: nls.LocalizeFunc = nls.loadMessageBundle();
@@ -250,6 +251,21 @@
                     args.push('-A');
                     args.push(generator.platform);
                 }
+            } else {
+                if (this.useCMakePresets) {
+                    const presetArchitecture = this.configurePresetArchitecture;
+                    const presetToolset = this.configurePresetToolset;
+                    const platform = presetArchitecture ? getValue(presetArchitecture) : undefined;
+                    const toolset = presetToolset ? getValue(presetToolset) : undefined;
+                    if (toolset) {
+                        args.push('-T');
+                        args.push(toolset);
+                    }
+                    if (platform) {
+                        args.push("-A");
+                        args.push(platform);
+                    }
+                }
             }
         }
 

src/installs/visualStudio.ts

@@ -135,7 +135,7 @@ export function targetArchFromGeneratorPlatform(generatorPlatform?: string) {
     if (!generatorPlatform) {
         return undefined;
     }
-    return vsArchFromGeneratorPlatform[generatorPlatform] || generatorPlatform;
+    return vsArchFromGeneratorPlatform[generatorPlatform.toLowerCase()] || generatorPlatform;
 }
 
 /**