From d9619512e10c0ad8fc67eeb86cbe2b7919f466b6 Mon Sep 17 00:00:00 2001
From: bugmaster <bugmaster@opencascade.com>
Date: Thu, 26 Sep 2019 19:30:41 +0300
Subject: [PATCH] Update of environment files
---
adm/templates/env.bat | 10 ++++++++++
adm/templates/env.bat.in | 9 +++++++++
2 files changed, 19 insertions(+)
diff --git a/adm/templates/env.bat b/adm/templates/env.bat
index ec330d4c08..4180f23999 100644
--- a/adm/templates/env.bat
+++ b/adm/templates/env.bat
@@ -102,6 +102,10 @@ if not "%DevEnvDir%" == "" (
for /f "usebackq delims=" %%i in (`vswhere.exe -version "[15.0,15.99]" -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do (
set "DevEnvDir=%%i\Common7\IDE\"
)
+) else if /I "%VCFMT%" == "vc142" (
+ for /f "usebackq delims=" %%i in (`vswhere.exe -version "[16.0,16.99]" -latest -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do (
+ set "DevEnvDir=%%i\Common7\IDE\"
+ )
) else if /I "%VCFMT%" == "gcc" (
rem MinGW
) else (
@@ -113,6 +117,7 @@ if not "%DevEnvDir%" == "" (
echo vc12 = VS 2013 ^(SP3^)
echo vc14 = VS 2015
echo vc141 = VS 2017
+ echo vc142 = VS 2019
exit /B
)
@@ -137,6 +142,11 @@ if /I "%VCFMT%" == "vc9" (
set "VCVARS=%%i\VC\Auxiliary\Build\vcvarsall.bat"
)
set "VCPlatformToolSet=v141"
+) else if /I "%VCFMT%" == "vc142" (
+ for /f "usebackq delims=" %%i in (`vswhere.exe -version "[16.0,16.99]" -latest -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do (
+ set "VCVARS=%%i\VC\Auxiliary\Build\vcvarsall.bat"
+ )
+ set "VCPlatformToolSet=v142"
) else if /I "%VCFMT%" == "gcc" (
rem MinGW
) else (
diff --git a/adm/templates/env.bat.in b/adm/templates/env.bat.in
index dd8f93e7b6..4843d0fde3 100644
--- a/adm/templates/env.bat.in
+++ b/adm/templates/env.bat.in
@@ -70,6 +70,10 @@ if not "%DevEnvDir%" == "" (
for /f "usebackq delims=" %%i in (`vswhere.exe -version "[15.0,15.99]" -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do (
set "DevEnvDir=%%i\Common7\IDE\"
)
+) else if /I "%VCFMT%" == "vc142" (
+ for /f "usebackq delims=" %%i in (`vswhere.exe -version "[16.0,16.99]" -latest -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do (
+ set "DevEnvDir=%%i\Common7\IDE\"
+ )
) else if /I "%VCFMT%" == "gcc" (
rem MinGW
) else (
@@ -98,6 +102,11 @@ if /I "%VCFMT%" == "vc9" (
set "VCVARS=%%i\VC\Auxiliary\Build\vcvarsall.bat"
)
set "VCPlatformToolSet=v141"
+) else if /I "%VCFMT%" == "vc142" (
+ for /f "usebackq delims=" %%i in (`vswhere.exe -version "[16.0,16.99]" -latest -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do (
+ set "VCVARS=%%i\VC\Auxiliary\Build\vcvarsall.bat"
+ )
+ set "VCPlatformToolSet=v142"
) else if /I "%VCFMT%" == "gcc" (
rem MinGW
) else (