Merge 5b2be5e into 42568b8

sakura-editor · Jan 8, 2022 · 41b6dda · 41b6dda
2 parents 42568b8 + 5b2be5e
commit 41b6dda
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 8 deletions.
diff --git a/tests/compiletests.run.cmd b/tests/compiletests.run.cmd
@@ -5,8 +5,6 @@ set SOURCE_DIR=%~dp0compiletests
 :: find generic tools
 if not defined CMD_VSWHERE call %~dp0..\tools\find-tools.bat
 
-set /a NUM_VSVERSION_NEXT=NUM_VSVERSION + 1
-
 if not exist "%CMD_CMAKE%" (
   echo "no cmake found."
   exit /b 1

diff --git a/tests/compiletests.targets b/tests/compiletests.targets
@@ -17,7 +17,7 @@
     </PropertyGroup>
     <SetEnv name="platform" value="$(Platform)" prefix="false" />
     <SetEnv name="configuration" value="$(Configuration)" prefix="false" />
-    <SetEnv name="NUM_VSVERSION" value="$(VsVersion)" prefix="false" />
+    <SetEnv name="ARG_VSVERSION" value="$(VsVersion)" prefix="false" />
     <Exec Command="$(MSBuildThisFileDirectory)compiletests.run.cmd &quot;$(CompileTestBuildDir)&quot;" ConsoleToMSBuild="true" />
   </Target>
   <Target Name="AppendCleanTargetsForCompileTest" BeforeTargets="CoreClean">

diff --git a/tests/googletest.targets b/tests/googletest.targets
@@ -37,7 +37,7 @@
     </PropertyGroup>
     <SetEnv name="platform" value="$(Platform)" prefix="false" />
     <SetEnv name="configuration" value="$(Configuration)" prefix="false" />
-    <SetEnv name="NUM_VSVERSION" value="$(VsVersion)" prefix="false" />
+    <SetEnv name="ARG_VSVERSION" value="$(VsVersion)" prefix="false" />
     <Exec Command="$(MSBuildThisFileDirectory)googletest.build.cmd &quot;$(GoogleTestBuildDir)&quot; &quot;$(GoogleTestInstallDir)&quot;" ConsoleToMSBuild="true" />
   </Target>
   <Target Name="AppendCleanTargetsForGoogleTest" BeforeTargets="CoreClean">

diff --git a/tools/find-tools.bat b/tools/find-tools.bat
@@ -154,10 +154,9 @@ exit /b
 ::
 :: ARG_VSVERSION
 ::     latest => the latest version of installed Visual Studio
-::     2017   => Visual Studio 2017
-::     2019   => Visual Studio 2019
-::     15     => Visual Studio 2017
-::     16     => Visual Studio 2019
+::     2017 or 15  => Visual Studio 2017
+::     2019 or 16  => Visual Studio 2019
+::     2022 or 17  => Visual Studio 2022
 :: ---------------------------------------------------------------------------------------------------------------------
 :msbuild
     :: convert productLineVersion to Internal Major Version
@@ -167,6 +166,8 @@ exit /b
         set NUM_VSVERSION=15
     ) else if "%ARG_VSVERSION%" == "2019" (
         set NUM_VSVERSION=16
+    ) else if "%ARG_VSVERSION%" == "2022" (
+        set NUM_VSVERSION=17
     ) else if "%ARG_VSVERSION%" == "latest" (
         call :check_latest_installed_vsversion
     ) else (
@@ -185,6 +186,8 @@ exit /b
         set CMAKE_G_PARAM=Visual Studio 15 2017
     ) else if "%NUM_VSVERSION%" == "16" (
         set CMAKE_G_PARAM=Visual Studio 16 2019
+    ) else if "%NUM_VSVERSION%" == "17" (
+        set CMAKE_G_PARAM=Visual Studio 17 2022
     ) else (
         call :set_cmake_gparam_automatically
     )

diff --git a/vcx-props/vcxcompat.props b/vcx-props/vcxcompat.props
@@ -6,10 +6,16 @@
   <PropertyGroup Label="Globals" Condition="'$(VisualStudioVersion)' == '16.0'">
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
+  <PropertyGroup Label="Globals" Condition="'$(VisualStudioVersion)' == '17.0'">
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(VisualStudioVersion)' == '15.0'">
     <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(VisualStudioVersion)' == '16.0'">
     <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(VisualStudioVersion)' == '17.0'">
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
 </Project>