Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
OpenFlipper-Free
OpenFlipper-Free
Commits
70b40ecb
Commit
70b40ecb
authored
Jun 19, 2017
by
Martin Schultz
Browse files
added missing year to windows ci script
parent
1164e1f3
Pipeline
#5283
failed with stage
in 10 minutes and 49 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CI/ci-windows.bat
View file @
70b40ecb
...
@@ -19,6 +19,7 @@ if "%COMPILER%" == "VS2015" (
...
@@ -19,6 +19,7 @@ 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
BUILD_PLATFORM
=
%COMPILER%
set
BUILD_PLATFORM
=
%COMPILER%
...
@@ -35,7 +36,7 @@ set ARCH_VS=
...
@@ -35,7 +36,7 @@ set ARCH_VS=
set
STRING_ARCH
=
32
-Bit
set
STRING_ARCH
=
32
-Bit
)
)
set
GENERATOR
=
Visual
Studio
%VS_COMPILERVERSION_SHORT%
%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_COMPILERVERSION_LONG%
\Common7\IDE\devenv.com"
:: determine Qt Version and set variables
:: determine Qt Version and set variables
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment