Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
OpenFlipper-Free
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
24
Issues
24
List
Boards
Labels
Milestones
Merge Requests
3
Merge Requests
3
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenFlipper-Free
OpenFlipper-Free
Commits
dcc23609
Commit
dcc23609
authored
May 17, 2018
by
Martin Schultz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update ci-windows-config.bat to accomodate for different install path of VS2017
parent
bdd250e3
Pipeline
#6981
failed with stages
in 33 minutes and 51 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
1 deletion
+6
-1
CI/ci-windows-config.bat
CI/ci-windows-config.bat
+6
-1
No files found.
CI/ci-windows-config.bat
View file @
dcc23609
...
...
@@ -7,24 +7,29 @@ set QT_COMPILERPREFIX=msvc2012
set
VS_COMPILERVERSION_LONG
=
11
.0
set
VS_COMPILERVERSION_SHORT
=
11
set
VS_EDITION_YEAR
=
2012
set
VS_EDITION_PATH
=
%VS_COMPILERVERSION_LONG%
)
if
"
%COMPILER%
"
==
"VS2013"
(
set
QT_COMPILERPREFIX
=
msvc2013
set
VS_COMPILERVERSION_LONG
=
12
.0
set
VS_COMPILERVERSION_SHORT
=
12
set
VS_EDITION_YEAR
=
2013
set
VS_EDITION_PATH
=
%VS_COMPILERVERSION_LONG%
)
if
"
%COMPILER%
"
==
"VS2015"
(
set
QT_COMPILERPREFIX
=
msvc2015
set
VS_COMPILERVERSION_LONG
=
14
.0
set
VS_COMPILERVERSION_SHORT
=
14
set
VS_EDITION_YEAR
=
2015
set
VS_EDITION_PATH
=
%VS_COMPILERVERSION_LONG%
)
if
"
%COMPILER%
"
==
"VS2017"
(
set
QT_COMPILERPREFIX
=
msvc2017
set
VS_COMPILERVERSION_LONG
=
15
.0
set
VS_COMPILERVERSION_SHORT
=
15
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%
...
...
@@ -41,7 +46,7 @@ set STRING_ARCH=32-Bit
)
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
if
"
%QT_VERSION%
"
==
"Qt5.5.1"
(
...
...
Write
Preview
Markdown
is supported
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