Skip to content

Commit

Permalink
only do special handling of ~ in linux, it breaks windows (#3965)
Browse files Browse the repository at this point in the history
  • Loading branch information
gcampbell-msft authored Aug 8, 2024
1 parent 7f2f5ab commit c848ee3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ Bug Fixes:
- Allow success recovery in the configure precondition handler. [#3554](https://github.com/microsoft/vscode-cmake-tools/issues/3554)
- Prevent second configure after `QuickStart` if the `automaticReconfigure` setting is enabled. [#3910](https://github.com/microsoft/vscode-cmake-tools/issues/3910)
- Set usepresets context after manually creating a CMakePresets.json/CMakeUserPresets.json or using QuickStart to create it. [#3854](https://github.com/microsoft/vscode-cmake-tools/issues/3854)
- Only do special handling of `~` for code model reply path on linux. [#3957](https://github.com/microsoft/vscode-cmake-tools/issues/3957)

## 1.18.43

Expand Down
3 changes: 2 additions & 1 deletion src/drivers/cmakeFileApiDriver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,8 @@ export class CMakeFileApiDriver extends CMakeDriver {

private toolchainWarningProvided: boolean = false;
private async updateCodeModel(binaryDir?: string): Promise<boolean> {
const reply_path = this.getCMakeReplyPath(binaryDir).replace('~', process.env.HOME || "./");
const initialReplyPath = this.getCMakeReplyPath(binaryDir);
const reply_path = process.platform === "linux" ? initialReplyPath.replace('~', process.env.HOME || "./") : initialReplyPath;
const indexFile = await loadIndexFile(reply_path);
if (indexFile) {
this._generatorInformation = indexFile.cmake.generator;
Expand Down

0 comments on commit c848ee3

Please sign in to comment.