VS2019 defaults to x64
This commit is contained in:
parent
eea7bac1e8
commit
40e5af8d57
1 changed files with 2 additions and 2 deletions
|
@ -30,7 +30,7 @@ echo QT Folder: %QT5x64%
|
||||||
REM Determine CMake toolchain
|
REM Determine CMake toolchain
|
||||||
set CMAKE_TOOLCHAIN=Visual Studio 14 2015 Win64
|
set CMAKE_TOOLCHAIN=Visual Studio 14 2015 Win64
|
||||||
for /f %%v in ('"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere" -latest -property catalog_productlineversion') do set VSx64=%%v
|
for /f %%v in ('"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere" -latest -property catalog_productlineversion') do set VSx64=%%v
|
||||||
if %VSx64%==2019 (set CMAKE_TOOLCHAIN="Visual Studio 16 2019" -A x64)
|
if %VSx64%==2019 (set CMAKE_TOOLCHAIN="Visual Studio 16 2019")
|
||||||
if %VSx64%==2017 (set CMAKE_TOOLCHAIN="Visual Studio 15 2017 Win64")
|
if %VSx64%==2017 (set CMAKE_TOOLCHAIN="Visual Studio 15 2017 Win64")
|
||||||
if %VSx64%==2015 (set CMAKE_TOOLCHAIN="Visual Studio 14 2015 Win64")
|
if %VSx64%==2015 (set CMAKE_TOOLCHAIN="Visual Studio 14 2015 Win64")
|
||||||
echo CMake Toolchain: %CMAKE_TOOLCHAIN%
|
echo CMake Toolchain: %CMAKE_TOOLCHAIN%
|
||||||
|
@ -49,7 +49,7 @@ if not exist vcpkg-git/NUL (
|
||||||
echo Updating vcpkg . . .
|
echo Updating vcpkg . . .
|
||||||
cd vcpkg-git
|
cd vcpkg-git
|
||||||
git pull
|
git pull
|
||||||
|
|
||||||
REM for /f "delims=" %%G in ('"git pull"') do if not %%G == "Already up to date." (
|
REM for /f "delims=" %%G in ('"git pull"') do if not %%G == "Already up to date." (
|
||||||
echo Compiling vcpkg
|
echo Compiling vcpkg
|
||||||
call .\bootstrap-vcpkg
|
call .\bootstrap-vcpkg
|
||||||
|
|
Loading…
Add table
Reference in a new issue