Skip to content

Commit 9da2cab

Browse files
committed
Merge branch 'feature/RestApiv2' of https://github.com/Yadoms/yadoms into feature/RestApiv2
2 parents 5eeaf17 + 87606dd commit 9da2cab

1 file changed

Lines changed: 15 additions & 28 deletions

File tree

cmake_windows.cmd

Lines changed: 15 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -9,53 +9,40 @@ setlocal & pushd .
99
@echo Yadoms build for Windows
1010
@echo ========================
1111
@echo.
12-
@echo To enable Windows XP compatiblity, please enter the platform toolset
13-
@echo.
14-
@echo v120_xp : platform toolset "Visual Studio 2013 - WindowsXP"
15-
@echo v140_xp : platform toolset "Visual Studio 2015 - WindowsXP"
16-
@echo v141_xp : platform toolset "Visual Studio 2017 - WindowsXP"
1712
@echo v142 : platform toolset "Visual Studio 2019"
1813
@echo v143 : platform toolset "Visual Studio 2022"
19-
@echo Leave empty to disable Windows XP compatibility
14+
@echo v144 : platform toolset "Visual Studio 2026"
15+
@echo.
16+
@echo Leave empty to use default toolset
2017
@echo.
2118
@echo.
2219

23-
set xp_compatibility=%1%
20+
set platformToolset=%1%
2421

2522
call:getCMakeExecutable cmake_executable
2623
"%cmake_executable%" --version
2724

2825
::Move to destination folder
2926
cd /D %~dp0/projects
3027

31-
if "%xp_compatibility%" == "" (
32-
@echo Using default generator WITHOUT WindowsXP support
28+
if "%platformToolset%" == "" (
29+
@echo Using default generator
3330
"%cmake_executable%" %~dp0/sources -A Win32
3431
goto:eof
3532
)
36-
if "%xp_compatibility%" == "v120_xp" (
37-
@echo Generating using "Visual Studio 2013" with WindowsXP support
38-
"%cmake_executable%" %~dp0/sources -T %xp_compatibility% -A Win32
39-
goto:eof
40-
)
41-
if "%xp_compatibility%" == "v140_xp" (
42-
@echo Generating using "Visual Studio 2015" with WindowsXP support
43-
"%cmake_executable%" %~dp0/sources -T %xp_compatibility% -A Win32
44-
goto:eof
45-
)
46-
if "%xp_compatibility%" == "v141_xp" (
47-
@echo Generating using "Visual Studio 2017" with WindowsXP support
48-
"%cmake_executable%" %~dp0/sources -T %xp_compatibility% -A Win32
49-
goto:eof
50-
)
51-
if "%xp_compatibility%" == "v142" (
33+
if "%platformToolset%" == "v142" (
5234
@echo Generating using "Visual Studio 2019"
53-
"%cmake_executable%" %~dp0/sources -A Win32
35+
"%cmake_executable%" -G "Visual Studio 16 2019" %~dp0/sources -A Win32
5436
goto:eof
5537
)
56-
if "%xp_compatibility%" == "v143" (
38+
if "%platformToolset%" == "v143" (
5739
@echo Generating using "Visual Studio 2022"
58-
"%cmake_executable%" %~dp0/sources -A Win32
40+
"%cmake_executable%" -G "Visual Studio 17 2022" %~dp0/sources -A Win32
41+
goto:eof
42+
)
43+
if "%platformToolset%" == "v144" (
44+
@echo Generating using "Visual Studio 2026"
45+
"%cmake_executable%" -G "Visual Studio 18 2026" %~dp0/sources -A Win32
5946
goto:eof
6047
)
6148
echo Error: invalid toolset selected

0 commit comments

Comments
 (0)