Skip to content

Commit 16e3df7

Browse files
authored
Fix wrong path created for artifacts when parsing code model (#4752)
1 parent b0882e2 commit 16e3df7

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
@@ -17,6 +17,7 @@ Improvements:
1717
- Allow preset modification commands to target CMakeUserPresets.json. The target file is determined by the focused editor, or by prompting the user when both files exist. [#4564](https://github.com/microsoft/vscode-cmake-tools/issues/4564)
1818

1919
Bug Fixes:
20+
- Fix wrong path created for artifact when parsing code model using CMake File API. [#3015](https://github.com/microsoft/vscode-cmake-tools/issues/3015)
2021
- Fix garbled characters (Mojibake) in the Output panel when MSVC outputs UTF-8 (e.g., with `/utf-8`) on non-UTF-8 Windows systems. When `cmake.outputLogEncoding` is `auto`, the build output is now validated as UTF-8 before falling back to the system code page. [#4520](https://github.com/microsoft/vscode-cmake-tools/issues/4520)
2122
- Fix CMakePresets.json discovery failing in multi-folder workspaces when the presets file is in a subdirectory specified by `cmake.sourceDirectory`. [#4727](https://github.com/microsoft/vscode-cmake-tools/issues/4727)
2223
- Fix initial kit scan ignoring `cmake.enableAutomaticKitScan: false` on first workspace open, and prevent redundant concurrent scans in multi-project workspaces. [#4726](https://github.com/microsoft/vscode-cmake-tools/issues/4726)

src/drivers/cmakeFileApi.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,7 @@ async function loadCodeModelTarget(rootPaths: CodeModelKind.PathInfo, jsonFile:
532532
sourceDirectory: convertToAbsolutePath(targetObject.paths.source, rootPaths.source),
533533
fullName: targetObject.nameOnDisk,
534534
artifacts: targetObject.artifacts ? targetObject.artifacts.map(
535-
a => convertToAbsolutePath(path.join(targetObject.paths.build, a.path), rootPaths.build))
535+
a => convertToAbsolutePath(a.path, rootPaths.build))
536536
: [],
537537
fileGroups,
538538
sysroot,

0 commit comments

Comments
 (0)