Skip to content

Commit 3d1b6ed

Browse files
committed
Add PR #4718 to CHANGELOG
1 parent ca4a00a commit 3d1b6ed

2 files changed

Lines changed: 6 additions & 1 deletion

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ Features:
99
Improvements:
1010
- Add MSVC linker error problem matching to the Problems pane. [#4675](https://github.com/microsoft/vscode-cmake-tools/pull/4675) [@bradphelan](https://github.com/bradphelan)
1111
- Use environment variables from `cmake.environment` and `cmake.configureEnvironment` when expanding `$penv{}` macros in CMake Presets `include` paths. [#3578](https://github.com/microsoft/vscode-cmake-tools/issues/3578)
12+
- Provide CMAKE_LANG_IMPLICIT_INCLUDE_DIRECTORIES as system includes. [#4718](https://github.com/microsoft/vscode-cmake-tools/pull/4718)
1213

1314
Bug Fixes:
1415
- Fix extension not switching to preset mode after "CMake: Quick Start" generates a CMakePresets.json, causing variant selection to have no effect. [#4569](https://github.com/microsoft/vscode-cmake-tools/issues/4569)

src/drivers/cmakeFileApi.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,11 @@ export async function loadToolchains(filename: string): Promise<Map<string, Code
594594

595595
return toolchains.toolchains.reduce((acc, el) => {
596596
if (el.compiler.path) {
597-
acc.set(el.language, { path: el.compiler.path, implicitIncludes: el.compiler.implicit.includeDirectories });
597+
acc.set(el.language, {
598+
path: el.compiler.path,
599+
target: el.compiler.target,
600+
implicitIncludes: el.compiler.implicit.includeDirectories
601+
});
598602
}
599603
return acc;
600604
}, new Map<string, CodeModelToolchain>());

0 commit comments

Comments
 (0)