Skip to content

Commit

Permalink
Clarify issue in CHANGELOG. Fix launch executable command. (#1779)
Browse files Browse the repository at this point in the history
* Clarify issue in CHANGELOG. Fix launch executable command.

* Fix typo in changelog
  • Loading branch information
andreeis authored Apr 19, 2021
1 parent f1f121d commit d1c5e2a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Bug fixes:
- Dependencies package versions upgrade. [PR #1475](https://github.com/microsoft/vscode-cmake-tools/pull/1475) [@lygstate](https://github.com/lygstate)
- Add vendor hostOs targetOs targetArch versionMajor versionMinor attributes for kit. [PR #1337](https://github.com/microsoft/vscode-cmake-tools/pull/1337) [@lygstate](https://github.com/lygstate)
- Always correctly build target executable path. [PR #1674](https://github.com/microsoft/vscode-cmake-tools/pull/1674) [@falbrechtskirchinger](https://github.com/falbrechtskirchinger)
- Use variables instead of hardcoded values for system path references. [PR #1690](https://github.com/microsoft/vscode-cmake-tools/pull/1690)
- Use variables instead of hardcoded values for system path references. [#883](https://github.com/microsoft/vscode-cmake-tools/issues/883) [@Zingam](https://github.com/Zingam)
- ctestPath should allow the same substitutions as cmakePath. [#785](https://github.com/microsoft/vscode-cmake-tools/issues/785) [@FakeTruth](https://github.com/FakeTruth)
- Change the order of available kits such that folder kits come first. [#1736](https://github.com/microsoft/vscode-cmake-tools/issues/1736)
- Fix "Configuring project" infinite loop when using "Locate" on a project without CMakeLists.txt. [#1704](https://github.com/microsoft/vscode-cmake-tools/issues/1704)
Expand Down
6 changes: 1 addition & 5 deletions src/drivers/cmakefileapi/api_helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -133,16 +133,12 @@ async function convertTargetObjectFileToExtensionTarget(build_dir: string, file_
executable_path = targetObject.artifacts.find(artifact => artifact.path.endsWith(targetObject.nameOnDisk));
if (executable_path) {
executable_path = convertToAbsolutePath(executable_path.path, build_dir);
if (!await fs.exists(executable_path)) {
// Will be empty after cmake configuration
executable_path = "";
}
}
}

return {
name: targetObject.name,
filepath: executable_path ? executable_path : 'Utility target',
filepath: executable_path,
targetType: targetObject.type,
type: 'rich' as 'rich'
} as api.RichTarget;
Expand Down

0 comments on commit d1c5e2a

Please sign in to comment.