Fix cmake tools integration when switching boards

Author: will-v-pi

package.json

@@ -111,6 +111,12 @@
         "category": "Raspberry Pi Pico",
         "enablement": "false"
       },
+      {
+        "command": "raspberry-pi-pico.getCompilerPath",
+        "title": "Get compiler path",
+        "category": "Raspberry Pi Pico",
+        "enablement": "false"
+      },
       {
         "command": "raspberry-pi-pico.getChip",
         "title": "Get Chip",

scripts/pico_project.py

@@ -903,10 +903,9 @@ def generateProjectFiles(projectPath, projectName, sdkPath, projects, debugger,
     {{
         "name": "Pico",
         "compilers": {{
-            "C": "{cPath}",
-            "CXX": "{cPath}"
+            "C": "${{command:raspberry-pi-pico.getCompilerPath}}",
+            "CXX": "${{command:raspberry-pi-pico.getCompilerPath}}"
         }},
-        "toolchainFile": "{propertiesSdkPath(sdkVersion)}/cmake/preload/toolchains/{CMAKE_TOOLCHAIN_NAME}",
         "environmentVariables": {{
             "PATH": "${{command:raspberry-pi-pico.getEnvPath}};${{env:PATH}}"
         }},

src/commands/configureCmake.mts

@@ -2,6 +2,7 @@ import { Command } from "./command.mjs";
 import Logger from "../logger.mjs";
 import { window, workspace } from "vscode";
 import { configureCmakeNinja } from "../utils/cmakeUtil.mjs";
+import Settings, { SettingsKey } from "../settings.mjs";
 
 export default class ConfigureCmakeCommand extends Command {
   private _logger: Logger = new Logger("ConfigureCmakeCommand");
@@ -23,6 +24,20 @@ export default class ConfigureCmakeCommand extends Command {
       return;
     }
 
+    const settings = Settings.getInstance();
+
+    if (
+      settings !== undefined &&
+      settings.getBoolean(SettingsKey.useCmakeTools)
+    ) {
+      void window.showErrorMessage(
+        "You must use the CMake Tools extension to configure your build. " +
+          "To use this extension instead, change the useCmakeTools setting."
+      );
+  
+      return;
+    }
+
     if (await configureCmakeNinja(workspaceFolder.uri)) {
       void window.showInformationMessage("CMake has configured your build.");
     } else {

src/commands/getPaths.mts

@@ -111,6 +111,44 @@ export class GetGDBPathCommand extends CommandWithResult<string> {
   }
 }
 
+export class GetCompilerPathCommand extends CommandWithResult<string> {
+  constructor() {
+    super("getCompilerPath");
+  }
+
+  async execute(): Promise<string> {
+    if (
+      workspace.workspaceFolders === undefined ||
+      workspace.workspaceFolders.length === 0
+    ) {
+      return "";
+    }
+
+    const workspaceFolder = workspace.workspaceFolders?.[0];
+
+    const selectedToolchainAndSDKVersions =
+      await cmakeGetSelectedToolchainAndSDKVersions(workspaceFolder.uri);
+    if (selectedToolchainAndSDKVersions === null) {
+      return "";
+    }
+    const toolchainVersion = selectedToolchainAndSDKVersions[1];
+
+    let triple = "arm-none-eabi";
+    if (toolchainVersion.includes("RISCV")) {
+      if (toolchainVersion.includes("COREV")) {
+        triple = "riscv32-corev-elf";
+      } else {
+        triple = "riscv32-unknown-elf";
+      }
+    }
+
+    return join(
+      buildToolchainPath(toolchainVersion), "bin",
+      triple + `-gcc${process.platform === "win32" ? ".exe" : ""}`
+    );
+  }
+}
+
 export class GetChipCommand extends CommandWithResult<string> {
   constructor() {
     super("getChip");

src/extension.mts

@@ -36,6 +36,7 @@ import {
   GetPythonPathCommand,
   GetEnvPathCommand,
   GetGDBPathCommand,
+  GetCompilerPathCommand,
   GetChipCommand,
   GetTargetCommand,
   GetChipUppercaseCommand,
@@ -106,6 +107,7 @@ export async function activate(context: ExtensionContext): Promise<void> {
     new GetPythonPathCommand(),
     new GetEnvPathCommand(),
     new GetGDBPathCommand(),
+    new GetCompilerPathCommand(),
     new GetChipCommand(),
     new GetChipUppercaseCommand(),
     new GetTargetCommand(),

src/utils/cmakeUtil.mts

@@ -119,15 +119,6 @@ export async function configureCmakeNinja(folder: Uri): Promise<boolean> {
     return false;
   }
 
-  if (settings.getBoolean(SettingsKey.useCmakeTools)) {
-    await window.showErrorMessage(
-      "You must use the CMake Tools extension to configure your build. " +
-        "To use this extension instead, change the useCmakeTools setting."
-    );
-
-    return false;
-  }
-
   if (existsSync(join(folder.fsPath, "build", "CMakeCache.txt"))) {
     // check if the build directory has been moved
 
@@ -158,6 +149,16 @@ export async function configureCmakeNinja(folder: Uri): Promise<boolean> {
     }
   }
 
+  if (settings.getBoolean(SettingsKey.useCmakeTools)) {
+    // CMake Tools integration is enabled - skip configuration
+    Logger.info(
+      LoggerSource.cmake,
+      "Skipping CMake configuration, as useCmakeTools is set."
+    );
+
+    return false;
+  }
+
   try {
     // check if CMakeLists.txt exists in the root folder
     await workspace.fs.stat(