Skip to content

Commit

Permalink
presets + cmake.buildToolArgs: make sure -- is added in all cases
Browse files Browse the repository at this point in the history
Fixes microsoft#3754.
This issue was introduced in microsoft#3537 (cmake.buildToolsArgs was ignored for presets before).
  • Loading branch information
JeremieA committed May 13, 2024
1 parent e0f9f61 commit 58816fa
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions src/preset.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2047,8 +2047,11 @@ export function buildArgs(preset: BuildPreset, tempOverrideArgs?: string[], temp
}

tempOverrideArgs && result.push(...tempOverrideArgs);
preset.nativeToolOptions && result.push('--', ...preset.nativeToolOptions);
tempOverrideBuildToolArgs && result.push(...tempOverrideBuildToolArgs);
if (preset.nativeToolOptions || tempOverrideBuildToolArgs) {
result.push('--');
preset.nativeToolOptions && result.push(...preset.nativeToolOptions);
tempOverrideBuildToolArgs && result.push(...tempOverrideBuildToolArgs);
}

return result;
}
Expand Down

0 comments on commit 58816fa

Please sign in to comment.