Skip to content

Commit

Permalink
Switch to use CTestCommandEnvironment
Browse files Browse the repository at this point in the history
  • Loading branch information
lygstate committed Nov 10, 2021
1 parent 88ea609 commit 4698cde
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/cmake-tools.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2045,8 +2045,8 @@ export class CMakeTools implements vscode.Disposable, api.CMakeToolsAPI {
async _getTargetLaunchEnvironment(drv: CMakeDriver | null, debug_env?: DebuggerEnvironmentVariable[]): Promise<EnvironmentVariablesBasic> {
const env = util.fromDebuggerEnvironmentVars(debug_env);

// Add environment variables from ConfigureEnvironment.
const ctestEnv = await drv?.getConfigureEnvironment();
// Add environment variables from CTestCommandEnvironment.
const ctestEnv = await drv?.getCTestCommandEnvironment();

return EnvironmentVariablesUtils.merge(env, ctestEnv);
}
Expand Down

0 comments on commit 4698cde

Please sign in to comment.