0032974: Configuration - update environment for VS2022

removing a repeating condition in install.bat

add vc143 in .md files

diff --git a/adm/qmake/OccCppConfig.pri b/adm/qmake/OccCppConfig.pri
index c9af8da42d5667bbdfe359557a3cc5373cfb4ea0..9464d8bcf47a20a37bdc696bc9df1dcf38b9286e 100644 (file)
--- a/adm/qmake/OccCppConfig.pri
+++ b/adm/qmake/OccCppConfig.pri
@@ -119,6 +119,8 @@ android-g++ {
     # VS2015, vc141
   } else:equals(aMsvcVer, 16.0){
     # VS2019, vc142
+  } else:equals(aMsvcVer, 17.0){
+    # VS2022, vc143
   } else {
     warning (Unknown msvc version. "$$MY_COMPILER" is used)
   }

diff --git a/adm/templates/build.bat b/adm/templates/build.bat
index 9f1fbc9712f851fb2495e75e96d95c3b7ac453b8..1a650cb45d9860f4c932cbca198879c993a8007a 100644 (file)
--- a/adm/templates/build.bat
+++ b/adm/templates/build.bat
@@ -23,6 +23,8 @@ if "%VCVER%" == "vc8" (
   call "%VS141COMNTOOLS%/vsvars32.bat" > nul
 ) else if "%VCVER%" == "vc142" (
   call "%VS142COMNTOOLS%/vsvars32.bat" > nul
+) else if "%VCVER%" == "vc143" (
+  call "%VS143COMNTOOLS%/vsvars32.bat" > nul
 ) else (
   echo Error: wrong VS identifier
   exit /B

diff --git a/adm/templates/env.bat.in b/adm/templates/env.bat.in
index 538ad7cc676c7405afc77c5b0604b32f478f55bf..354a177cd1d3a902d14c6d2327d55f9a843ab0aa 100644 (file)
--- a/adm/templates/env.bat.in
+++ b/adm/templates/env.bat.in
@@ -74,6 +74,10 @@ if not "%DevEnvDir%" == "" (
   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%" == "vc143" (
+  for /f "usebackq delims=" %%i in (`vswhere.exe -version "[17.0,17.99]" -latest -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do (
+    set "DevEnvDir=%%i\Common7\IDE\"
+  ) 
 ) else if /I "%VCFMT%" == "gcc" (
   rem MinGW
 ) else (
@@ -107,6 +111,11 @@ if /I "%VCFMT%" == "vc9" (
     set "VCVARS=%%i\VC\Auxiliary\Build\vcvarsall.bat"
   ) 
   set "VCPlatformToolSet=v142"
+) else if /I "%VCFMT%" == "vc143" (
+  for /f "usebackq delims=" %%i in (`vswhere.exe -version "[17.0,17.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 (
@@ -126,6 +135,7 @@ if ["%ARCH%"] == ["64"] set VCARCH=amd64
 
 if /I ["%1"] == ["vc141"] set "VCVER=vc14"
 if /I ["%1"] == ["vc142"] set "VCVER=vc14"
+if /I ["%1"] == ["vc143"] set "VCVER=vc14"
 
 if exist "%CASROOT%\custom.bat" (
   call "%CASROOT%\custom.bat" %VCVER% %ARCH% %CASDEB%

diff --git a/adm/templates/env.samples.bat.in b/adm/templates/env.samples.bat.in
index 7cbb822ff14eba41c693b6564dbbdb3753dd46df..a787deed460f2aee096186ec6ed55f02050feb0a 100644 (file)
--- a/adm/templates/env.samples.bat.in
+++ b/adm/templates/env.samples.bat.in
@@ -7,6 +7,7 @@ if exist "%~dp0custom.bat" (
 call "@INSTALL_DIR_ABSOLUTE@\@INSTALL_DIR_SCRIPT@\env.bat" %1 %2 %3
 if /I ["%1"] == ["vc141"] set "VCVER=vc141"
 if /I ["%1"] == ["vc142"] set "VCVER=vc142"
+if /I ["%1"] == ["vc143"] set "VCVER=vc143"
 set "BIN_DIR=win%ARCH%\%VCVER%\bind"
 set "LIB_DIR=win%ARCH%\%VCVER%\libd"
 

diff --git a/adm/templates/install.bat b/adm/templates/install.bat
index d19409e3e830a2b2704afbcd47a1a07c29c558f3..89a2d66cf5be46185b54f93342b6cac610a2cab7 100644 (file)
--- a/adm/templates/install.bat
+++ b/adm/templates/install.bat
@@ -23,6 +23,8 @@ if "%VCVER%" == "vc8" (
   call "%VS141COMNTOOLS%/vsvars32.bat" > nul
 ) else if "%VCVER%" == "vc142" (
   call "%VS142COMNTOOLS%/vsvars32.bat" > nul
+) else if "%VCVER%" == "vc143" (
+  call "%VS143COMNTOOLS%/vsvars32.bat" > nul
 ) else (
   echo Error: wrong VS identifier
   exit /B

diff --git a/dox/build/build_occt/building_occt.md b/dox/build/build_occt/building_occt.md
index db2d9e4feb586a64cd7e2fa1feed4ca4998d2dd9..2e1c7ec18aa7e3310bc21231ecdf47260be59b18 100644 (file)
--- a/dox/build/build_occt/building_occt.md
+++ b/dox/build/build_occt/building_occt.md
@@ -324,6 +324,7 @@ The environment is defined in the file *custom.sh* (on Linux and macOS) or *cust
 | vc141-uwp | 2017 (15)             | UWP (Universal Windows Platform) | vc14-uwp |
 | vc142     | 2019 (16)             | Desktop (Windows API)            | vc14 |
 | vc142-uwp | 2019 (16)             | UWP (Universal Windows Platform) | vc14-uwp |
+| vc143     | 2022 (17)             | Desktop (Windows API)            | vc14 |
 
 Alternatively, you can launch **genconf**, a GUI tool allowing to configure build options interactively.
 That tool will analyze your environment and propose you to choose available options:

diff --git a/dox/introduction/introduction.md b/dox/introduction/introduction.md
index 38d3df50a0a53781b706d58f90fea0f15df9ef2a..0e18f48aa87fb74bd8718f1774a3ef8274f87998 100644 (file)
--- a/dox/introduction/introduction.md
+++ b/dox/introduction/introduction.md
@@ -462,7 +462,7 @@ To run any Open CASCADE Technology application you need to set the environment v
 
 You can define the environment variables with env.bat script located in the 
 $CASROOT folder. This script accepts two arguments to be used: 
-the version of Visual Studio (vc12 -- vc142) and the architecture (win32 or win64).
+the version of Visual Studio (vc12 -- vc143) and the architecture (win32 or win64).
 
 The additional environment settings necessary for compiling OCCT libraries and samples 
 by Microsoft Visual Studio can be set using script custom.bat located in the same folder. 

diff --git a/samples/qt/OCCTOverview/env.bat b/samples/qt/OCCTOverview/env.bat
index ade739d46bf51bd0591aac2d294f47e88651ff6a..6dc128a1e1a504ec112436c10015fdac1634d3af 100644 (file)
--- a/samples/qt/OCCTOverview/env.bat
+++ b/samples/qt/OCCTOverview/env.bat
@@ -7,6 +7,7 @@ if exist "%~dp0custom.bat" (
 call "%CASROOT%\env.bat" %1 %2 %3
 if /I ["%1"] == ["vc141"] set "VCVER=vc141"
 if /I ["%1"] == ["vc142"] set "VCVER=vc142"
+if /I ["%1"] == ["vc143"] set "VCVER=vc143"
 set "BIN_DIR=win%ARCH%\%VCVER%\bind"
 set "LIB_DIR=win%ARCH%\%VCVER%\libd"