actions
/
setup-cpp
Template
mirror of https://github.com/aminya/setup-cpp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: enable VCTargetsPath and use 14.0 for VS2015

This commit is contained in:
Amin Yahyaabadi 2021-12-06 04:08:08 -06:00
parent 95f4f7daa1
commit 1da5fb1680
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/setup_cpp.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/setup_cpp.js.map vendored
View File

File diff suppressed because one or more lines are too long

15
src/msvc/msvc.ts
View File

@ -1,6 +1,5 @@
import { setupChocoPack } from "../utils/setup/setupChocoPack" import { setupChocoPack } from "../utils/setup/setupChocoPack"
import { error, exportVariable } from "@actions/core" import { error } from "@actions/core"
import { existsSync } from "fs"
import { setupVCVarsall } from "../vcvarsall/vcvarsall" import { setupVCVarsall } from "../vcvarsall/vcvarsall"
type MSVCVersion = "2015" | "2017" | "2019" | string type MSVCVersion = "2015" | "2017" | "2019" | string
@ -22,21 +21,17 @@ export async function setupMSVC(
// https://github.com/aminya/setup-cpp/issues/1 // https://github.com/aminya/setup-cpp/issues/1
try { try {
if (version === "2015") { if (version === "2015") {
toolset = "14.0.25420.1" toolset = "14.0"
await setupChocoPack("visualcpp-build-tools", toolset, []) await setupChocoPack("visualcpp-build-tools", "14.0.25420.1", [])
VCTargetsPath = "C:/Program Files (x86)/MSBuild/Microsoft.Cpp/v4.0/v140" VCTargetsPath = "C:/Program Files (x86)/MSBuild/Microsoft.Cpp/v4.0/v140"
if (existsSync(VCTargetsPath)) {
exportVariable("VCTargetsPath", VCTargetsPath)
}
} else if (version === "2017") { } else if (version === "2017") {
toolset = "14.16" toolset = "14.16"
await setupChocoPack("visualstudio2017buildtools", "15.9.41.0", []) await setupChocoPack("visualstudio2017buildtools", "15.9.41.0", [])
// VCTargetsPath = "C:/Program Files (x86)/Microsoft Visual Studio/2017/BuildTools/VC/Tools/MSVC/14.16" // TODO verify path VCTargetsPath = "C:/Program Files (x86)/Microsoft Visual Studio/2017/BuildTools/VC/Tools/MSVC/14.16" // TODO verify path
} else if (version === "2019") { } else if (version === "2019") {
toolset = "14.29" toolset = "14.29"
await setupChocoPack("visualstudio2019buildtools", "16.11.7.0", []) await setupChocoPack("visualstudio2019buildtools", "16.11.7.0", [])
// VCTargetsPath = "C:/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/VC/Tools/MSVC/14.29.30133" VCTargetsPath = "C:/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/VC/Tools/MSVC/14.29.30133"
} }
} catch (e) { } catch (e) {
error(e as string | Error) error(e as string | Error)