From: will-v-pi <108662275+will-v-pi@users.noreply.github.com>
Date: Mon, 9 Sep 2024 13:37:58 +0000 (+0100)
Subject: Merge branch 'main' into main
X-Git-Url: https://repo.jachan.dev/pico-vscode.git/commitdiff_plain/HEAD

Merge branch 'main' into main
---

3ab15ce6870e2a6fd09bd1867f0f3b75f7c16ac7
diff --cc src/utils/cmakeUtil.mts
index 0062f5e,a1e4e88..4a4c7fb
--- a/src/utils/cmakeUtil.mts
+++ b/src/utils/cmakeUtil.mts
@@@ -337,11 -340,8 +340,11 @@@ export async function cmakeUpdateSDK
          "endif()\n" +
          `set(sdkVersion ${newSDKVersion})\n` +
          `set(toolchainVersion ${newToolchainVersion})\n` +
-         `set(picotoolVersion ${picotoolVersion})\n` +
+         `set(picotoolVersion ${newPicotoolVersion})\n` +
 -        `include(${buildCMakeIncPath(false)}/pico-vscode.cmake)\n` +
 +        `set(picoVscode ${buildCMakeIncPath(false)}/pico-vscode.cmake)\n` +
 +        "if (EXISTS ${picoVscode})\n" +
 +        "    include(${picoVscode})\n" +
 +        "endif()\n" +
          // eslint-disable-next-line max-len
          "# ===================================================================================="
        );