Commit dcc23609 authored by Martin Schultz's avatar Martin Schultz
Browse files

Update ci-windows-config.bat to accomodate for different install path of VS2017

parent bdd250e3
...@@ -7,24 +7,29 @@ set QT_COMPILERPREFIX=msvc2012 ...@@ -7,24 +7,29 @@ set QT_COMPILERPREFIX=msvc2012
set VS_COMPILERVERSION_LONG=11.0 set VS_COMPILERVERSION_LONG=11.0
set VS_COMPILERVERSION_SHORT=11 set VS_COMPILERVERSION_SHORT=11
set VS_EDITION_YEAR=2012 set VS_EDITION_YEAR=2012
set VS_EDITION_PATH=%VS_COMPILERVERSION_LONG%
) )
if "%COMPILER%" == "VS2013" ( if "%COMPILER%" == "VS2013" (
set QT_COMPILERPREFIX=msvc2013 set QT_COMPILERPREFIX=msvc2013
set VS_COMPILERVERSION_LONG=12.0 set VS_COMPILERVERSION_LONG=12.0
set VS_COMPILERVERSION_SHORT=12 set VS_COMPILERVERSION_SHORT=12
set VS_EDITION_YEAR=2013 set VS_EDITION_YEAR=2013
set VS_EDITION_PATH=%VS_COMPILERVERSION_LONG%
) )
if "%COMPILER%" == "VS2015" ( if "%COMPILER%" == "VS2015" (
set QT_COMPILERPREFIX=msvc2015 set QT_COMPILERPREFIX=msvc2015
set VS_COMPILERVERSION_LONG=14.0 set VS_COMPILERVERSION_LONG=14.0
set VS_COMPILERVERSION_SHORT=14 set VS_COMPILERVERSION_SHORT=14
set VS_EDITION_YEAR=2015 set VS_EDITION_YEAR=2015
set VS_EDITION_PATH=%VS_COMPILERVERSION_LONG%
) )
if "%COMPILER%" == "VS2017" ( if "%COMPILER%" == "VS2017" (
set QT_COMPILERPREFIX=msvc2017 set QT_COMPILERPREFIX=msvc2017
set VS_COMPILERVERSION_LONG=15.0 set VS_COMPILERVERSION_LONG=15.0
set VS_COMPILERVERSION_SHORT=15 set VS_COMPILERVERSION_SHORT=15
set VS_EDITION_YEAR=2017 set VS_EDITION_YEAR=2017
::VS2017 default install path is different from other versions
set VS_EDITION_PATH=\%VS_EDITION_YEAR%\Professional
) )
set BUILD_PLATFORM=%COMPILER% set BUILD_PLATFORM=%COMPILER%
...@@ -41,7 +46,7 @@ set STRING_ARCH=32-Bit ...@@ -41,7 +46,7 @@ set STRING_ARCH=32-Bit
) )
set GENERATOR=Visual Studio %VS_COMPILERVERSION_SHORT% %VS_EDITION_YEAR%%ARCH_VS% set GENERATOR=Visual Studio %VS_COMPILERVERSION_SHORT% %VS_EDITION_YEAR%%ARCH_VS%
set VS_PATH="C:\Program Files (x86)\Microsoft Visual Studio %VS_COMPILERVERSION_LONG%\Common7\IDE\devenv.com" set VS_PATH="C:\Program Files (x86)\Microsoft Visual Studio %VS_EDITION_PATH%\Common7\IDE\devenv.com"
:: determine Qt Version and set variables :: determine Qt Version and set variables
if "%QT_VERSION%" == "Qt5.5.1" ( if "%QT_VERSION%" == "Qt5.5.1" (
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment