Merge c1b0547 into 90d6766

sakura-editor · Feb 24, 2022 · 9ebaf75 · 9ebaf75
2 parents 90d6766 + c1b0547
commit 9ebaf75
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/sakura/githash.targets b/sakura/githash.targets
@@ -7,6 +7,10 @@
       Outputs="$(GeneratedGitHash)"
       AfterTargets="SelectClCompile"
       BeforeTargets="ClCompile">
+    <PropertyGroup>
+      <VsVersion>$([System.Text.RegularExpressions.Regex]::Replace('$(VisualStudioVersion)', '^(\d+).*', '$1'))</VsVersion>
+    </PropertyGroup>
+    <SetEnv name="NUM_VSVERSION" value="$(VsVersion)" prefix="false" />
     <Exec Command="..\sakura\githash.bat ..\sakura_core $(GeneratedGitHash)" />
   </Target>
 </Project>
diff --git a/tools/find-tools.bat b/tools/find-tools.bat
@@ -257,6 +257,7 @@ exit /b
     exit /b
 
 :cmake
+set /a NUM_VSVERSION_NEXT=NUM_VSVERSION + 1
 for /f "usebackq delims=" %%a in (`"%CMD_VSWHERE%" -property installationPath -version [%NUM_VSVERSION%^,%NUM_VSVERSION_NEXT%^)`) do (
     pushd "%%a"
     call "%%a\Common7\Tools\vsdevcmd\ext\cmake.bat"