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
463e913b
Commit
463e913b
authored
Jun 19, 2017
by
Martin Schultz
Browse files
added plain qt version number to windows ci script
allows finding of qwt
parent
fd39f956
Pipeline
#5288
failed with stage
in 94 minutes and 26 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CI/ci-windows.bat
View file @
463e913b
...
...
@@ -40,15 +40,19 @@ set VS_PATH="C:\Program Files (x86)\Microsoft Visual Studio %VS_COMPILERVERSION_
:: determine Qt Version and set variables
if
"
%QT_VERSION%
"
==
"Qt5.6.2"
(
set
QT_REV_LONG
=
5
.6.2
set
QT_REV
=
5
.6
)
if
"
%QT_VERSION%
"
==
"Qt5.7.0"
(
set
QT_REV_LONG
=
5
.7.0
set
QT_REV
=
5
.7
)
if
"
%QT_VERSION%
"
==
"Qt5.8.0"
(
set
QT_REV_LONG
=
5
.8.0
set
QT_REV
=
5
.8
)
if
"
%QT_VERSION%
"
==
"Qt5.9.0"
(
set
QT_REV_LONG
=
5
.9.0
set
QT_REV
=
5
.9
)
...
...
@@ -64,8 +68,8 @@ set GLEW_INCLUDE_DIR=%LIBPATH_BASE%\%ARCHITECTURE%\glew-1.13.0\include
set
GLEW_LIBRARY_DIR
=
%LIBPATH_BASE%
\
%ARCHITECTURE%
\glew
-
1
.13.0\lib\glew32.lib
set
QWT6_INCLUDE_DIR
=
%LIBPATH_BASE%
\
%ARCHITECTURE%
\qwt
-
6
.1.3
-qt
%QT_VERSION%
\include
set
QWT6_LIBRARY
=
%LIBPATH_BASE%
\
%ARCHITECTURE%
\qwt
-
6
.1.3
-qt
%QT_VERSION%
\lib\qwt.lib
:: set QWT6_LIBRARY_RELEASE=%LIBPATH_BASE%\%ARCHITECTURE%\qwt-6.1.3-qt%QT_
VERSI
ON%\lib\qwt.lib
:: set QWT6_LIBRARY_DEBUG=%LIBPATH_BASE%\%ARCHITECTURE%\qwt-6.1.3-qt%QT_
VERSI
ON%\lib\qwtd.lib
:: set QWT6_LIBRARY_RELEASE=%LIBPATH_BASE%\%ARCHITECTURE%\qwt-6.1.3-qt%QT_
REV_L
ON
G
%\lib\qwt.lib
:: set QWT6_LIBRARY_DEBUG=%LIBPATH_BASE%\%ARCHITECTURE%\qwt-6.1.3-qt%QT_
REV_L
ON
G
%\lib\qwtd.lib
set
CMAKE_CONFIGURATION
=
%QT_BASE_CONFIG%
-DGLUT
_INCLUDE_DIR
=
"
%GLUT_INCLUDE_DIR%
"
-DGLUT
_glut_LIBRARY
=
"
%GLUT_GLUT_LIBRARY%
"
-DGLEW
_INCLUDE_DIR
=
"
%GLEW_INCLUDE_DIR%
"
-DGLEW
_LIBRARY
=
"
%GLEW_LIBRARY_DIR%
"
-DQWT
6
_INCLUDE_DIR
=
%QWT6
_INCLUDE_DIR
%
-DQWT
6
_LIBRARY
=
%QWT6
_LIBRARY
%
...
...
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