bugfix of releasetest.bat

treefrogframework · Oct 31, 2022 · f43ec93 · f43ec93
1 parent ddc43f9
commit f43ec93
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 2 deletions.
diff --git a/tools/test/releasetest/releasetest.bat b/tools/test/releasetest/releasetest.bat
@@ -39,7 +39,41 @@ if "%QMAKE%" == "" (
   exit /B 1
 )
 
+:: cmake options
+devenv /? | find "Visual Studio 2022" >NUL
+if not ERRORLEVEL 1 (
+  set VSVER=2022
+  if /i "%Platform%" == "x64" (
+    set CMAKEOPT=-G"Visual Studio 17 2022" -A x64
+  ) else (
+    set CMAKEOPT=-G"Visual Studio 17 2022" -A Win32
+  )
+  goto :step1
+)
+
+devenv /? | find "Visual Studio 2019" >NUL
+if not ERRORLEVEL 1 (
+  set VSVER=2019
+  if /i "%Platform%" == "x64" (
+    set CMAKEOPT=-G"Visual Studio 16 2019" -A x64
+  ) else (
+    set CMAKEOPT=-G"Visual Studio 16 2019" -A Win32
+  )
+  goto :step1
+)
+
+devenv /? | find "Visual Studio 2017" >NUL
+if not ERRORLEVEL 1 (
+  set VSVER=2017
+  if /i "%Platform%" == "x64" (
+    set CMAKEOPT=-G"Visual Studio 15 2017 Win64"
+  ) else (
+    set CMAKEOPT=-G"Visual Studio 15 2017"
+  )
+  goto :step1
+)
 
+:step1
 cd /D %BASEDIR%
 rd /Q /S %APPNAME%
 tspawn new %APPNAME%
@@ -97,7 +131,7 @@ cd /D %APPDIR%
 if exist build rd /Q /S build
 del /Q /F lib\*.*
 cmake --version
-cmake -S . -B build -DCMAKE_BUILD_TYPE=%1
+cmake %CMAKEOPT% -S . -B build -DCMAKE_BUILD_TYPE=%1
 if ERRORLEVEL 1 (
   echo;
   echo CMake Error!

diff --git a/tools/tspawn/main.cpp b/tools/tspawn/main.cpp
@@ -506,7 +506,7 @@ static void printSuccessMessage(const QString &model)
         msg += "\n or\n\ncmake:\n";
         msg += " Run `cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug` to generate Makefile for debug mode.\n";
         msg += " Run `cmake -S . -B build -DCMAKE_BUILD_TYPE=Release` to generate Makefile for release mode.\n";
-        msg += " Run `cd build; make cmake` to regenerate Makefile.";
+        msg += " Run `cmake --build build --target cmake` to regenerate Makefile.";
     }
 
     putchar('\n');