Skip to content

Commit

Permalink
Merge pull request #1 from vector-of-bool/develop
Browse files Browse the repository at this point in the history
pull original
  • Loading branch information
bbosnjak authored Oct 16, 2016
2 parents 5066cd2 + 3749603 commit 04eb99c
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ scripting language. For that I recommend [this extension](https://marketplace.vi
variant](https://github.com/vector-of-bool/vscode-cmake-tools/blob/develop/docs/build_variants.md) you would like to configure with.
The default variants are the same old CMake build types most users are familiar with.
- Many smaller fixes and tweaks.
- **0.6.1**:
- Can now specify environment variables for CMake configure/build
- Bug fixes and tweaks
- **0.6.2** HOTFIX: Fix issues passing environment variables to child processes

### Version 0.5.0

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "cmake-tools",
"displayName": "CMake Tools",
"description": "Extended CMake support in Visual Studio Code",
"version": "0.6.0",
"version": "0.6.2",
"repository": {
"type": "git",
"url": "https://github.com/vector-of-bool/vscode-cmake-tools"
Expand Down
3 changes: 2 additions & 1 deletion src/cmake.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1187,7 +1187,8 @@ export class CMakeTools {
const pipe = proc.spawn(this.config.cmakePath, args, {
env: Object.assign(
Object.assign({}, options.environment),
this.config.environment
this.config.environment,
process.env
)
});
const status = msg => vscode.window.setStatusBarMessage(msg, 4000);
Expand Down

0 comments on commit 04eb99c

Please sign in to comment.