Skip to content

Commit a381fc0

Browse files
committed
fix: specify the toolset
1 parent 73ec89a commit a381fc0

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,11 @@ The package can be used locally or from CI services like GitHub Actions. Stay tu
1515

1616
`setup-cpp` can install all of these tools:
1717

18-
- llvm
19-
- gcc
2018
- cmake
2119
- ninja
20+
- llvm
21+
- gcc
22+
- msvc
2223
- vcvarsall
2324
- vcpkg
2425
- meson

dist/setup_cpp.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/setup_cpp.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/msvc/msvc.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export async function setupMSVC(
2222
// https://github.com/aminya/setup-cpp/issues/1
2323
try {
2424
if (version === "2015") {
25-
// toolset = "14.0.25420.1"
25+
toolset = "14.0.25420.1"
2626
await setupChocoPack("visualcpp-build-tools", toolset, [
2727
"--ignore-dependencies",
2828
"--params",
@@ -34,14 +34,14 @@ export async function setupMSVC(
3434
exportVariable("VCTargetsPath", VCTargetsPath)
3535
}
3636
} else if (version === "2017") {
37-
// toolset = "14.16"
37+
toolset = "14.16"
3838
await setupChocoPack("visualstudio2017buildtools", "15.9.41.0", [
3939
"--package-parameters",
4040
"'--add Microsoft.VisualStudio.Workload.NativeDesktop --includeRecommended --passive'",
4141
])
4242
// VCTargetsPath = "C:/Program Files (x86)/Microsoft Visual Studio/2017/BuildTools/VC/Tools/MSVC/14.16" // TODO verify path
4343
} else if (version === "2019") {
44-
// toolset = "14.29.30133"
44+
toolset = "14.29"
4545
await setupChocoPack("visualstudio2019buildtools", "16.11.7.0", [
4646
"--package-parameters",
4747
"'--add Microsoft.VisualStudio.Workload.NativeDesktop --includeRecommended --passive'",

0 commit comments

Comments
 (0)