Skip to content

Commit

Permalink
Fixes #3811 - checks for cmake.exe again if it wasnt present the prev…
Browse files Browse the repository at this point in the history
…ious time (#3840)

checks for exe again if it wasn't present the previous time
  • Loading branch information
qarni authored Jun 21, 2024
1 parent 1ffb1c4 commit 5718cf4
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ Bug Fixes:
- Fix issue with "Test Results Not Found" when `cmake.ctest.allowParallelJobs` is disabled. [#3798](https://github.com/microsoft/vscode-cmake-tools/issues/3798)
- Update localized strings for Project Status UI and quick pick dropdowns. [#3803](https://github.com/microsoft/vscode-cmake-tools/issues/3803), [#3802](https://github.com/microsoft/vscode-cmake-tools/issues/3802)
- Fix issue where new presets couldn't inherit from presets in CmakeUserPresets.json. These presets are now added to CmakeUserPresets.json instead of CmakePresets.json. [#3725](https://github.com/microsoft/vscode-cmake-tools/issues/3725)
- Fix issue where CMakeTools does not recheck CMake Path to see if user installed CMake after launching VS Code. [3811](https://github.com/microsoft/vscode-cmake-tools/issues/3811)

## 1.18.42

Expand Down
10 changes: 6 additions & 4 deletions src/cmake/cmakeExecutable.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,12 @@ export async function getCMakeExecutableInformation(path: string): Promise<CMake
const normalizedPath = util.platformNormalizePath(path);
if (cmakeInfo.has(normalizedPath)) {
const cmakeExe: CMakeExecutable = cmakeInfo.get(normalizedPath)!;
await setCMakeDebuggerAvailableContext(
cmakeExe.isDebuggerSupported?.valueOf() ?? false
);
return cmakeExe;
if (cmakeExe.isPresent) {
await setCMakeDebuggerAvailableContext(
cmakeExe.isDebuggerSupported?.valueOf() ?? false
);
return cmakeExe;
}
}

try {
Expand Down

0 comments on commit 5718cf4

Please sign in to comment.