Skip to content

Commit 5201864

Browse files
Fix additionalKits not shown when showSystemKits is false (#4660)
* Fix: Include additionalKits regardless of showSystemKits setting Co-authored-by: hanniavalera <[email protected]> * Add changelog entry for additionalKits fix Co-authored-by: hanniavalera <[email protected]> * Update changelog entry to reference correct PR #4660 Co-authored-by: hanniavalera <[email protected]> * Update changelog entry to reference issue #4651 Co-authored-by: hanniavalera <[email protected]> --------- Co-authored-by: copilot-swe-agent[bot] <[email protected]> Co-authored-by: hanniavalera <[email protected]>
1 parent 98b87f9 commit 5201864

2 files changed

Lines changed: 2 additions & 1 deletion

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ Bug Fixes:
1515
- Fix `cmake.compileFile` failing to find compilation info when using presets without `CMAKE_EXPORT_COMPILE_COMMANDS`. [#4484](https://github.com/microsoft/vscode-cmake-tools/issues/4484)
1616
- Fix "Copy Value" in CMake debugger copying variable name instead of value. [#4551](https://github.com/microsoft/vscode-cmake-tools/issues/4551)
1717
- cmakeDriver: Fixes getCompilerVersion by using compilerPath instead of compilerName. [#4647](https://github.com/microsoft/vscode-cmake-tools/pull/4647) [@lygstate](https://github.com/lygstate)
18+
- Fix kits from `cmake.additionalKits` not being shown when `cmake.showSystemKits` is `false`. [#4651](https://github.com/microsoft/vscode-cmake-tools/issues/4651)
1819

1920
## 1.22.27
2021

src/kits/kitsController.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ export class KitsController {
8989
if (this.project.workspaceContext.config.showSystemKits) {
9090
return KitsController.specialKits.concat(this.folderKits.concat(this.additionalKits.concat(KitsController.userKits)));
9191
} else {
92-
return KitsController.specialKits.concat(this.folderKits);
92+
return KitsController.specialKits.concat(this.folderKits.concat(this.additionalKits));
9393
}
9494
}
9595

0 commit comments

Comments
 (0)